Merge "Frameworks/base: Check before foreach in Script"

2015-03-16 19:17:44 +00:00
parent 3d33314e03 c8ddcddd13
commit f3e581c99f
1 changed files with 4 additions and 2 deletions
--- a/rs/java/android/renderscript/Script.java
+++ b/rs/java/android/renderscript/Script.java
@@ -239,8 +239,10 @@ public class Script extends BaseObj {
                           FieldPacker v, LaunchOptions sc) {
        // TODO: Is this necessary if nScriptForEach calls validate as well?
        mRS.validate();
-        for (Allocation ain : ains) {
-          mRS.validateObject(ain);
+        if (ains != null) {
+            for (Allocation ain : ains) {
+                mRS.validateObject(ain);
+            }
        }
        mRS.validateObject(aout);