diff options
| author | Yang Ni <yangni@google.com> | 2016-04-18 23:34:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-18 23:34:06 +0000 |
| commit | ecf094ae9d715ac3cff6213fae4c904f9dd791e8 (patch) | |
| tree | 2540c7bc4a3046e7f9f9a15c1bb34273425bcfbd /rs/java/android/renderscript/ScriptGroup.java | |
| parent | 0d47f4b6463077074abd6bed489a5f9243615c64 (diff) | |
| parent | 07837d6dab331b1693aa3689223b4012012a7fad (diff) | |
Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup.java')
| -rw-r--r-- | rs/java/android/renderscript/ScriptGroup.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java index 35ae8b406e45..0d10c6d9dc50 100644 --- a/rs/java/android/renderscript/ScriptGroup.java +++ b/rs/java/android/renderscript/ScriptGroup.java @@ -1074,7 +1074,11 @@ public final class ScriptGroup extends BaseObj { protected void finalize() throws Throwable { // Clear out the list mClosures to avoid double-destroying the closures, // in case their finalizers race ahead. - mClosures.clear(); + if (mClosures != null) { + // ScriptGroup created using the old Builder class does not + // initialize the field mClosures + mClosures.clear(); + } super.finalize(); } } |