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

Commit 18314cac authored by Yang Ni's avatar Yang Ni
Browse files

Move new script group API into ScriptGroup class 

And mark existing methods and builder deprecated.
Removed ScriptGroup2 class.
Renamed nested class UnboundValue to Input.
Marked classes Closure, Future, and Input as final.

Change-Id: I362910c115e9d0173dc515674e08bf4878232879
parent 9d4efdf2

api/current.txt

+22 −31
Original line number Diff line number Diff line
@@ -27959,12 +27959,19 @@ package android.renderscript { 
  }















  public final class ScriptGroup extends android.renderscript.BaseObj {













    method public void execute();













    method public void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public java.lang.Object[] execute(java.lang.Object...);













    method public deprecated void execute();













    method public deprecated void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public deprecated void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);















  }



























  public static final class ScriptGroup.Builder {













  public static final class ScriptGroup.Binding {













    ctor public ScriptGroup.Binding(android.renderscript.Script.FieldID, java.lang.Object);













    method public android.renderscript.Script.FieldID getField();













    method public java.lang.Object getValue();













  }

























  public static final deprecated class ScriptGroup.Builder {















    ctor public ScriptGroup.Builder(android.renderscript.RenderScript);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID);









@@ -27972,39 +27979,23 @@ package android.renderscript {













    method public android.renderscript.ScriptGroup create();















  }



























  public class ScriptGroup2 extends android.renderscript.BaseObj {













    ctor public ScriptGroup2(long, android.renderscript.RenderScript);













    method public java.lang.Object[] execute(java.lang.Object...);













  }

























  public static final class ScriptGroup2.Binding {













    ctor public ScriptGroup2.Binding(android.renderscript.Script.FieldID, java.lang.Object);













    method public android.renderscript.Script.FieldID getField();













    method public java.lang.Object getValue();













  }

























  public static final class ScriptGroup2.Builder {













    ctor public ScriptGroup2.Builder(android.renderscript.RenderScript);













    method public android.renderscript.ScriptGroup2.UnboundValue addInput();













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













    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(java.lang.String, android.renderscript.ScriptGroup2.Future...);













  public static final class ScriptGroup.Builder2 {













    ctor public ScriptGroup.Builder2(android.renderscript.RenderScript);













    method public android.renderscript.ScriptGroup.Input addInput();













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













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













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















  }



























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













    ctor public ScriptGroup2.Closure(long, android.renderscript.RenderScript);













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













    ctor public ScriptGroup2.Closure(android.renderscript.RenderScript, android.renderscript.Script.InvokeID, java.lang.Object[], java.util.Map<android.renderscript.Script.FieldID, java.lang.Object>);













    method public android.renderscript.ScriptGroup2.Future getGlobal(android.renderscript.Script.FieldID);













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













  public static final class ScriptGroup.Closure extends android.renderscript.BaseObj {













    method public android.renderscript.ScriptGroup.Future getGlobal(android.renderscript.Script.FieldID);













    method public android.renderscript.ScriptGroup.Future getReturn();















  }



























  public static class ScriptGroup2.Future {













  public static final class ScriptGroup.Future {















  }



























  public static class ScriptGroup2.UnboundValue {













  public static final class ScriptGroup.Input {















  }





























  public abstract class ScriptIntrinsic extends android.renderscript.Script {

























api/system-current.txt



+22
−31




























Original line number
Diff line number
Diff line








@@ -29962,12 +29962,19 @@ package android.renderscript {













  }





























  public final class ScriptGroup extends android.renderscript.BaseObj {













    method public void execute();













    method public void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public java.lang.Object[] execute(java.lang.Object...);













    method public deprecated void execute();













    method public deprecated void setInput(android.renderscript.Script.KernelID, android.renderscript.Allocation);













    method public deprecated void setOutput(android.renderscript.Script.KernelID, android.renderscript.Allocation);















  }



























  public static final class ScriptGroup.Builder {













  public static final class ScriptGroup.Binding {













    ctor public ScriptGroup.Binding(android.renderscript.Script.FieldID, java.lang.Object);













    method public android.renderscript.Script.FieldID getField();













    method public java.lang.Object getValue();













  }

























  public static final deprecated class ScriptGroup.Builder {















    ctor public ScriptGroup.Builder(android.renderscript.RenderScript);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.FieldID);















    method public android.renderscript.ScriptGroup.Builder addConnection(android.renderscript.Type, android.renderscript.Script.KernelID, android.renderscript.Script.KernelID);









@@ -29975,39 +29982,23 @@ package android.renderscript {













    method public android.renderscript.ScriptGroup create();















  }



























  public class ScriptGroup2 extends android.renderscript.BaseObj {













    ctor public ScriptGroup2(long, android.renderscript.RenderScript);













    method public java.lang.Object[] execute(java.lang.Object...);













  }

























  public static final class ScriptGroup2.Binding {













    ctor public ScriptGroup2.Binding(android.renderscript.Script.FieldID, java.lang.Object);













    method public android.renderscript.Script.FieldID getField();













    method public java.lang.Object getValue();













  }

























  public static final class ScriptGroup2.Builder {













    ctor public ScriptGroup2.Builder(android.renderscript.RenderScript);













    method public android.renderscript.ScriptGroup2.UnboundValue addInput();













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













    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(java.lang.String, android.renderscript.ScriptGroup2.Future...);













  public static final class ScriptGroup.Builder2 {













    ctor public ScriptGroup.Builder2(android.renderscript.RenderScript);













    method public android.renderscript.ScriptGroup.Input addInput();













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













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













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















  }



























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













    ctor public ScriptGroup2.Closure(long, android.renderscript.RenderScript);













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













    ctor public ScriptGroup2.Closure(android.renderscript.RenderScript, android.renderscript.Script.InvokeID, java.lang.Object[], java.util.Map<android.renderscript.Script.FieldID, java.lang.Object>);













    method public android.renderscript.ScriptGroup2.Future getGlobal(android.renderscript.Script.FieldID);













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













  public static final class ScriptGroup.Closure extends android.renderscript.BaseObj {













    method public android.renderscript.ScriptGroup.Future getGlobal(android.renderscript.Script.FieldID);













    method public android.renderscript.ScriptGroup.Future getReturn();















  }



























  public static class ScriptGroup2.Future {













  public static final class ScriptGroup.Future {















  }



























  public static class ScriptGroup2.UnboundValue {













  public static final class ScriptGroup.Input {















  }





























  public abstract class ScriptIntrinsic extends android.renderscript.Script {

























rs/java/android/renderscript/ScriptGroup.java



+577
−20


























File changed.
Preview size limit exceeded, changes collapsed.
























rs/java/android/renderscript/ScriptGroup2.java
deleted100644 → 0



+0
−592


























File deleted.
Preview size limit exceeded, changes collapsed.