commit 25684ceff53dcc1646d1abaec1185edd1a0c38cb
author Yang Ni <yangni@google.com> Tue Mar 07 00:36:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 07 00:36:19 2017 +0000
tree 17d464b10c29a9fe3746f5119ec07c3d8fbd13de
parent c2dcebe6e631f499d75c57bfe24eccbb0129c863
parent 97c9b57cece7f9ba6dbf5d8c305ef404e25191fd

Merge "Removed close guards for Element and Type objects"
am: 97c9b57cec

Change-Id: I28b4149b6a0ace42dff2ca4ce9a1803b0baa4430

rs/java/android/renderscript/Element.java

diff --git a/rs/java/android/renderscript/Element.java b/rs/java/android/renderscript/Element.java
index 9d2f750..667bf71 100644
--- a/rs/java/android/renderscript/Element.java
+++ b/rs/java/android/renderscript/Element.java
@@ -1071,7 +1071,6 @@
             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 @@
         mKind = dk;
         mNormalized = norm;
         mVectorSize = size;
-        guard.open("destroy");
     }
 
     Element(long id, RenderScript rs) {

rs/java/android/renderscript/Type.java

diff --git a/rs/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java
index 9252898..dc23785 100644
--- a/rs/java/android/renderscript/Type.java
+++ b/rs/java/android/renderscript/Type.java
@@ -227,7 +227,6 @@
 
     Type(long id, RenderScript rs) {
         super(id, rs);
-        guard.open("destroy");
     }
 
     @Override