Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script"

Browse Source 
* commit '8df1bedcba5bf146c49ba6b6a89e4f97c018045c':
  Frameworks/base: Fix potential NPE in Script
This commit is contained in:
Andreas Gampe
2015-03-18 22:33:01 +00:00
committed by Android Git Automerger
parent 6a9cd7b0d4 8df1bedcba
commit 1dae2f9341
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rs/java/android/renderscript/Script.java
View File

@@ -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;