From ad555f91a0f95c6778a0e0f9a2a9cfd57dc00b6c Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Tue, 17 Mar 2015 20:05:46 -0700 Subject: Frameworks/base: Fix potential NPE in Script Bug: 19797138 Change-Id: I5cd9394bd2c0f7c044c1f2f24665384fa797cd97 --- rs/java/android/renderscript/Script.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'rs/java/android') diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java index 83aeedd..65056ac 100644 --- a/rs/java/android/renderscript/Script.java +++ b/rs/java/android/renderscript/Script.java @@ -251,9 +251,14 @@ public class Script extends BaseObj { "At least one of ain or aout is required to be non-null."); } - long[] in_ids = new long[ains.length]; - for (int index = 0; index < ains.length; ++index) { - in_ids[index] = ains[index].getID(mRS); + long[] in_ids; + if (ains != null) { + in_ids = new long[ains.length]; + for (int index = 0; index < ains.length; ++index) { + in_ids[index] = ains[index].getID(mRS); + } + } else { + in_ids = null; } long out_id = 0; -- cgit v1.1