commit 82ed817c43dc209dea60838e5633173ee00c3318
author Yang Ni <yangni@google.com> Mon Apr 18 23:38:14 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 18 23:38:14 2016 +0000
tree 43ff731acee6216c7e4556078abdd2419c72cd70
parent 63696c00e22b26edb239e024a5ddabda812dc9d0
parent ecf094ae9d715ac3cff6213fae4c904f9dd791e8

Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev
am: ecf094a

* commit 'ecf094ae9d715ac3cff6213fae4c904f9dd791e8':
  Fixed ScriptGroup finalizer for old API

Change-Id: Ia673958b883634197077b69aebd8af293088fef0

rs/java/android/renderscript/ScriptGroup.java

diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java
index 35ae8b4..0d10c6d 100644
--- a/rs/java/android/renderscript/ScriptGroup.java
+++ b/rs/java/android/renderscript/ScriptGroup.java
@@ -1074,7 +1074,11 @@
     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();
     }
 }