Improve renderscript context teardown. Track object in the system and then force their cleanup by releasing all user references once destroy context is called. Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.

2 files changed, 6 insertions, 1 deletions

diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java
index c25f16a..c626d5d 100644
--- a/graphics/java/android/renderscript/BaseObj.java
+++ b/graphics/java/android/renderscript/BaseObj.java
@@ -60,9 +60,10 @@ class BaseObj {
     protected void finalize() throws Throwable
     {
         if (!mDestroyed) {
-            if(mID != 0) {
+            if(mID != 0 && mRS.isAlive()) {
                 mRS.nObjDestroyOOB(mID);
             }
+            mRS = null;
             mID = 0;
             mDestroyed = true;
             Log.v(RenderScript.LOG_TAG,
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index f815f52..ed61691 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -219,6 +219,10 @@ public class RenderScript {
         mDev = 0;
     }
 
+    boolean isAlive() {
+        return mContext != 0;
+    }
+
     void pause() {
         nContextPause();
     }