Merge "Remove OOB object destruction."

graphics/java/android/renderscript/BaseObj.java

@@ -62,7 +62,7 @@ class BaseObj {
     {
         if (!mDestroyed) {
             if(mID != 0 && mRS.isAlive()) {
-                mRS.nObjDestroyOOB(mID);
+                mRS.nObjDestroy(mID);
             }
             mRS = null;
             mID = 0;

graphics/java/android/renderscript/RenderScript.java

@@ -143,10 +143,6 @@ public class RenderScript {
     synchronized void nObjDestroy(int id) {
         rsnObjDestroy(mContext, id);
     }
-    native void rsnObjDestroyOOB(int con, int id);
-    synchronized void nObjDestroyOOB(int id) {
-        rsnObjDestroyOOB(mContext, id);
-    }
     native int  rsnFileOpen(int con, byte[] name);
     synchronized int nFileOpen(byte[] name) {
         return rsnFileOpen(mContext, name);