diff options
author | Yang Ni <yangni@google.com> | 2016-04-04 17:09:11 -0700 |
---|---|---|
committer | Yang Ni <yangni@google.com> | 2016-04-12 09:01:44 -0700 |
commit | 44d1b3bfba63ec3610d34621780824368f915672 (patch) | |
tree | cd6c150d0da684251a602d014917ff7e335927e0 | |
parent | 390a81302f13a0285e58e550cf786255ce5f8bd8 (diff) | |
download | android_frameworks_base-44d1b3bfba63ec3610d34621780824368f915672.tar.gz android_frameworks_base-44d1b3bfba63ec3610d34621780824368f915672.tar.bz2 android_frameworks_base-44d1b3bfba63ec3610d34621780824368f915672.zip |
Destroy Closures in ScriptGroup
Bug: 27973681
Implemented correct destruction in ScriptGroup.destroy() and
Clsoure.destroy(), which properly destroys child BaseObj's.
Change-Id: I946f62c2979d6a338b8883514cacad472a213c5c
(cherry picked from commit 44e2f45f0cab4a429e59f07c1e5bf0eef08c7819)
-rw-r--r-- | rs/java/android/renderscript/ScriptGroup.java | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java index 219f16b91ba..35ae8b406e4 100644 --- a/rs/java/android/renderscript/ScriptGroup.java +++ b/rs/java/android/renderscript/ScriptGroup.java @@ -187,6 +187,23 @@ public final class ScriptGroup extends BaseObj { guard.open("destroy"); } + /** + * Destroys this Closure and the Allocation for its return value + */ + public void destroy() { + super.destroy(); + if (mReturnValue != null) { + mReturnValue.destroy(); + } + } + + protected void finalize() throws Throwable { + // Set null mReturnValue to avoid double-destroying it, in case its + // finalizer races ahead. + mReturnValue = null; + super.finalize(); + } + private void retrieveValueAndDependenceInfo(RenderScript rs, int index, Script.FieldID fid, Object obj, long[] values, int[] sizes, @@ -1015,6 +1032,8 @@ public final class ScriptGroup extends BaseObj { throw new RSIllegalArgumentException("invalid script group name"); } ScriptGroup ret = new ScriptGroup(mRS, name, mClosures, mInputs, outputs); + mClosures = new ArrayList<Closure>(); + mInputs = new ArrayList<Input>(); return ret; } @@ -1042,4 +1061,20 @@ public final class ScriptGroup extends BaseObj { } + /** + * Destroy this ScriptGroup and all Closures in it + */ + public void destroy() { + super.destroy(); + for(Closure c : mClosures) { + c.destroy(); + } + } + + protected void finalize() throws Throwable { + // Clear out the list mClosures to avoid double-destroying the closures, + // in case their finalizers race ahead. + mClosures.clear(); + super.finalize(); + } } |