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

Commit 407a385b authored by David Gross's avatar David Gross Committed by Android (Google) Code Review
Browse files

Merge "Unhide Script::reduce() interface for general reduction."

parents cc25a8a2 ba038689

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32855,6 +32855,7 @@ package android.renderscript { 
    method public void getVarV(int, android.renderscript.FieldPacker);

    method protected void invoke(int);

    method protected void invoke(int, android.renderscript.FieldPacker);

    method protected void reduce(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);

    method public void setTimeZone(java.lang.String);

    method public void setVar(int, float);

    method public void setVar(int, double);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -35052,6 +35052,7 @@ package android.renderscript { 
    method public void getVarV(int, android.renderscript.FieldPacker);

    method protected void invoke(int);

    method protected void invoke(int, android.renderscript.FieldPacker);

    method protected void reduce(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);

    method public void setTimeZone(java.lang.String);

    method public void setVar(int, float);

    method public void setVar(int, double);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32869,6 +32869,7 @@ package android.renderscript { 
    method public void getVarV(int, android.renderscript.FieldPacker);

    method protected void invoke(int);

    method protected void invoke(int, android.renderscript.FieldPacker);

    method protected void reduce(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);

    method public void setTimeZone(java.lang.String);

    method public void setVar(int, float);

    method public void setVar(int, double);

rs/java/android/renderscript/Script.java

+0 −1
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ public class Script extends BaseObj { 
    /**

     * Only intended for use by generated reflected code.  (General reduction)

     *

     * @hide

     */

    protected void reduce(int slot, Allocation[] ains, Allocation aout, LaunchOptions sc) {

        mRS.validate();