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

Commit 0590423d authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "unhide AllocationAdapter APIs"

parents 3daef246 20666679

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -26726,8 +26726,11 @@ package android.renderscript { 
  public class AllocationAdapter extends android.renderscript.Allocation {

    method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation);

    method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation);

    method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type);

    method public void setArray(int, int);

    method public void setFace(android.renderscript.Type.CubemapFace);

    method public void setLOD(int);

    method public void setX(int);

    method public void setY(int);

    method public void setZ(int);

  }

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -28524,8 +28524,11 @@ package android.renderscript { 
  public class AllocationAdapter extends android.renderscript.Allocation {

    method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation);

    method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation);

    method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type);

    method public void setArray(int, int);

    method public void setFace(android.renderscript.Type.CubemapFace);

    method public void setLOD(int);

    method public void setX(int);

    method public void setY(int);

    method public void setZ(int);

  }

rs/java/android/renderscript/AllocationAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class AllocationAdapter extends Allocation { 




    /**

     * @hide

     *

     * Set the active X.  The x value must be within the range for

     * the allocation being adapted.

     *
@@ -208,7 +208,7 @@ public class AllocationAdapter extends Allocation { 
    }



    /**

     * @hide

     *

     */

    public void setArray(int arrayNum, int arrayVal) {

        if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) {
@@ -242,7 +242,7 @@ public class AllocationAdapter extends Allocation { 
    }



    /**

     * @hide

     *

     *

     * Create an arbitrary window into the base allocation

     * The type describes the shape of the window.