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

Commit 922346c0 authored by Yang Ni's avatar Yang Ni Committed by Android (Google) Code Review
Browse files

Merge "Add a name to ScriptGroup2.Builder.create method"

parents b4140e42 17098562

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -27638,7 +27638,7 @@ package android.renderscript { 
    method public android.renderscript.ScriptGroup2.Closure addInvoke(android.renderscript.Script.InvokeID, java.lang.Object...);

    method public android.renderscript.ScriptGroup2.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object[], java.util.Map<android.renderscript.Script.FieldID, java.lang.Object>);

    method public android.renderscript.ScriptGroup2.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object...);

    method public android.renderscript.ScriptGroup2 create(android.renderscript.ScriptGroup2.Future...);

    method public android.renderscript.ScriptGroup2 create(java.lang.String, android.renderscript.ScriptGroup2.Future...);

  }















  public static class ScriptGroup2.Closure extends android.renderscript.BaseObj {

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -29624,7 +29624,7 @@ package android.renderscript {













    method public android.renderscript.ScriptGroup2.Closure addInvoke(android.renderscript.Script.InvokeID, java.lang.Object...);















    method public android.renderscript.ScriptGroup2.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object[], java.util.Map<android.renderscript.Script.FieldID, java.lang.Object>);















    method public android.renderscript.ScriptGroup2.Closure addKernel(android.renderscript.Script.KernelID, android.renderscript.Type, java.lang.Object...);













    method public android.renderscript.ScriptGroup2 create(android.renderscript.ScriptGroup2.Future...);













    method public android.renderscript.ScriptGroup2 create(java.lang.String, android.renderscript.ScriptGroup2.Future...);















  }





























  public static class ScriptGroup2.Closure extends android.renderscript.BaseObj {

























rs/java/android/renderscript/ScriptGroup2.java



+7
−1




























Original line number
Diff line number
Diff line








@@ -549,11 +549,17 @@ public class ScriptGroup2 extends BaseObj {













        /**















         * Creates a script group















         *













         * @param name name for the script group. Legal names can only contain letters, digits,













         *        '-', or '_'. The name can be no longer than 100 characters.















         * @param outputs futures intended as outputs of the script group















         * @return a script group















         */





























        public ScriptGroup2 create(Future... outputs) {













        public ScriptGroup2 create(String name, Future... outputs) {













            if (name == null || name.isEmpty() || name.length() > 100 ||













                !name.equals(name.replaceAll("[^a-zA-Z0-9-]", "_"))) {













                throw new RSIllegalArgumentException("invalid script group name");













            }















            ScriptGroup2 ret = new ScriptGroup2(mRS, mClosures, mInputs, outputs);















            return ret;















        }