commit 716475daa1562b9a7cd950215d83364756ef065a
author Andreas Gampe <agampe@google.com> Mon Mar 16 20:26:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 16 20:26:43 2015 +0000
tree ac8b5e124d0077bfa08f8586f6541aebd443f758
parent 6ec9fd8b3b6c6722a86921a0d065b092c17082e8
parent e685753136ee8e88212ad95b24284a153c86a0c1

am e6857531: am f3e581c9: Merge "Frameworks/base: Check before foreach in Script"

* commit 'e685753136ee8e88212ad95b24284a153c86a0c1':
  Frameworks/base: Check before foreach in Script

rs/java/android/renderscript/Script.java

diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java
index d352130..83aeedd 100644
--- a/rs/java/android/renderscript/Script.java
+++ b/rs/java/android/renderscript/Script.java
@@ -239,8 +239,10 @@
                            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);