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

am: 04d8f0c843

Change-Id: I036507ba5241fcd0e5ce6f7bb3599cb0720b0cfb

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) {

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