summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2017-03-07 00:36:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-07 00:36:19 +0000
commit25684ceff53dcc1646d1abaec1185edd1a0c38cb (patch)
tree17d464b10c29a9fe3746f5119ec07c3d8fbd13de /rs/java/android/renderscript
parentc2dcebe6e631f499d75c57bfe24eccbb0129c863 (diff)
parent97c9b57cece7f9ba6dbf5d8c305ef404e25191fd (diff)
Merge "Removed close guards for Element and Type objects"
am: 97c9b57cec Change-Id: I28b4149b6a0ace42dff2ca4ce9a1803b0baa4430
Diffstat (limited to 'rs/java/android/renderscript')
-rw-r--r--rs/java/android/renderscript/Element.java2
-rw-r--r--rs/java/android/renderscript/Type.java1
2 files changed, 0 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java
index 9d2f75080bb6..667bf71363da 100644
--- a/rs/java/android/renderscript/Element.java
+++ b/rs/java/android/renderscript/Element.java
@@ -1071,7 +1071,6 @@ public class Element extends BaseObj {
mSize += mElements[ct].mSize * mArraySizes[ct];
}
updateVisibleSubElements();
- guard.open("destroy");
}
Element(long id, RenderScript rs, DataType dt, DataKind dk, boolean norm, int size) {
@@ -1091,7 +1090,6 @@ public class Element extends BaseObj {
mKind = dk;
mNormalized = norm;
mVectorSize = size;
- guard.open("destroy");
}
Element(long id, RenderScript rs) {
diff --git a/rs/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java
index 9252898781f4..dc2378596d00 100644
--- a/rs/java/android/renderscript/Type.java
+++ b/rs/java/android/renderscript/Type.java
@@ -227,7 +227,6 @@ public class Type extends BaseObj {
Type(long id, RenderScript rs) {
super(id, rs);
- guard.open("destroy");
}
@Override