From c8ddcddd13bda93758295713a29fa4b924451ff6 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Sun, 15 Mar 2015 15:57:30 -0700
Subject: Frameworks/base: Check before foreach in Script

According to the if below, ains == null is potentially valid. But
the foreach loop would throw a NullPointerException.

Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
---
 rs/java/android/renderscript/Script.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rs/java/android/renderscript/Script.java')

diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java
index d35213057eef..83aeedd9540e 100644
--- 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);
 
-- 
cgit v1.2.3