Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 716475da authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

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

* commit 'e6857531':
  Frameworks/base: Check before foreach in Script
parents 6ec9fd8b e6857531

rs/java/android/renderscript/Script.java

+4 −2
Original line number Diff line number Diff line
@@ -239,9 +239,11 @@ public class Script extends BaseObj { 
                           FieldPacker v, LaunchOptions sc) {

        // TODO: Is this necessary if nScriptForEach calls validate as well?

        mRS.validate();

        if (ains != null) {

            for (Allocation ain : ains) {

                mRS.validateObject(ain);

            }

        }

        mRS.validateObject(aout);



        if (ains == null && aout == null) {