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

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

Merge "Hide array allocation"

parents b1a39467 d016266d

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -27262,7 +27262,6 @@ package android.renderscript { 
    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);
@@ -28085,8 +28084,6 @@ package android.renderscript { 
    method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int);

    method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int);

    method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int);

    method public int getArray(int);

    method public int getArrayCount();

    method public int getCount();

    method public android.renderscript.Element getElement();

    method public int getX();
@@ -28100,7 +28097,6 @@ package android.renderscript { 
  public static class Type.Builder {

    ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element);

    method public android.renderscript.Type create();

    method public android.renderscript.Type.Builder setArray(int, int);

    method public android.renderscript.Type.Builder setFaces(boolean);

    method public android.renderscript.Type.Builder setMipmaps(boolean);

    method public android.renderscript.Type.Builder setX(int);

api/system-current.txt

+0 −4
Original line number Diff line number Diff line
@@ -29265,7 +29265,6 @@ package android.renderscript { 
    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);
@@ -30088,8 +30087,6 @@ package android.renderscript { 
    method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int);

    method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int);

    method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int);

    method public int getArray(int);

    method public int getArrayCount();

    method public int getCount();

    method public android.renderscript.Element getElement();

    method public int getX();
@@ -30103,7 +30100,6 @@ package android.renderscript { 
  public static class Type.Builder {

    ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element);

    method public android.renderscript.Type create();

    method public android.renderscript.Type.Builder setArray(int, int);

    method public android.renderscript.Type.Builder setFaces(boolean);

    method public android.renderscript.Type.Builder setMipmaps(boolean);

    method public android.renderscript.Type.Builder setX(int);

rs/java/android/renderscript/AllocationAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ public class AllocationAdapter extends Allocation { 
    }



    /**

     *

     * @hide

     */

    public void setArray(int arrayNum, int arrayVal) {

        if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) {

rs/java/android/renderscript/Type.java

+3 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ public class Type extends BaseObj { 
    }



    /**

     * @hide

      * Return the dimension of the specified array.

      *

      * @param arrayNum  The array dimension to query
@@ -169,6 +170,7 @@ public class Type extends BaseObj { 
    }



    /**

     * @hide

      * Return the number of array dimensions.

      *

      * @return int
@@ -382,6 +384,7 @@ public class Type extends BaseObj { 
        }



        /**

         * @hide

         * Adds an array dimension to the builder

         *

         * @param dim