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

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

Browse Source 
* commit 'f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
  Frameworks/base: Check before foreach in Script
This commit is contained in:
Andreas Gampe
2015-03-16 19:31:17 +00:00
committed by Android Git Automerger
parent c3228a9d40 f3e581c99f
commit e685753136
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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