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

Commit 3c4ca688 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

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

* commit '1dae2f93':
  Frameworks/base: Fix potential NPE in Script
parents 2d5b2c7d 1dae2f93

rs/java/android/renderscript/Script.java

+8 −3
Original line number Diff line number Diff line
@@ -251,10 +251,15 @@ 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];

        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;

        if (aout != null) {