diff options
| author | Yang Ni <yangni@google.com> | 2016-04-18 23:38:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-18 23:38:14 +0000 |
| commit | 82ed817c43dc209dea60838e5633173ee00c3318 (patch) | |
| tree | 43ff731acee6216c7e4556078abdd2419c72cd70 /rs/java/android/renderscript | |
| parent | 63696c00e22b26edb239e024a5ddabda812dc9d0 (diff) | |
| parent | ecf094ae9d715ac3cff6213fae4c904f9dd791e8 (diff) | |
Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev
am: ecf094a
* commit 'ecf094ae9d715ac3cff6213fae4c904f9dd791e8':
Fixed ScriptGroup finalizer for old API
Change-Id: Ia673958b883634197077b69aebd8af293088fef0
Diffstat (limited to 'rs/java/android/renderscript')
| -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(); } } |