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

Commit 258db504 authored by Miao Wang's avatar Miao Wang
Browse files

[RenderScript] Remove @hide for the new APIs for Allocation.CopyTo 

Change-Id: I9ef476ae3e659d98d21c9246aa8e4969e00c14f1
parent 0590423d

api/current.txt

+20 −0
Original line number Diff line number Diff line
@@ -26647,6 +26647,16 @@ package android.renderscript { 
    method public void copy1DRangeFromUnchecked(int, int, short[]);

    method public void copy1DRangeFromUnchecked(int, int, byte[]);

    method public void copy1DRangeFromUnchecked(int, int, float[]);

    method public void copy1DRangeTo(int, int, java.lang.Object);

    method public void copy1DRangeTo(int, int, int[]);

    method public void copy1DRangeTo(int, int, short[]);

    method public void copy1DRangeTo(int, int, byte[]);

    method public void copy1DRangeTo(int, int, float[]);

    method public void copy1DRangeToUnchecked(int, int, java.lang.Object);

    method public void copy1DRangeToUnchecked(int, int, int[]);

    method public void copy1DRangeToUnchecked(int, int, short[]);

    method public void copy1DRangeToUnchecked(int, int, byte[]);

    method public void copy1DRangeToUnchecked(int, int, float[]);

    method public void copy2DRangeFrom(int, int, int, int, java.lang.Object);

    method public void copy2DRangeFrom(int, int, int, int, byte[]);

    method public void copy2DRangeFrom(int, int, int, int, short[]);
@@ -26654,6 +26664,14 @@ package android.renderscript { 
    method public void copy2DRangeFrom(int, int, int, int, float[]);

    method public void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int);

    method public void copy2DRangeFrom(int, int, android.graphics.Bitmap);

    method public void copy2DRangeTo(int, int, int, int, java.lang.Object);

    method public void copy2DRangeTo(int, int, int, int, byte[]);

    method public void copy2DRangeTo(int, int, int, int, short[]);

    method public void copy2DRangeTo(int, int, int, int, int[]);

    method public void copy2DRangeTo(int, int, int, int, float[]);

    method public void copy3DRangeFrom(int, int, int, int, int, int, java.lang.Object);

    method public void copy3DRangeFrom(int, int, int, int, int, int, android.renderscript.Allocation, int, int, int);

    method public void copy3DRangeTo(int, int, int, int, int, int, java.lang.Object);

    method public void copyFrom(android.renderscript.BaseObj[]);

    method public void copyFrom(java.lang.Object);

    method public void copyFrom(int[]);
@@ -26673,6 +26691,7 @@ package android.renderscript { 
    method public void copyTo(short[]);

    method public void copyTo(int[]);

    method public void copyTo(float[]);

    method public void copyToFieldPacker(int, int, int, int, android.renderscript.FieldPacker);

    method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);

    method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);

    method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
@@ -26698,6 +26717,7 @@ package android.renderscript { 
    method public deprecated synchronized void resize(int);

    method public void setFromFieldPacker(int, android.renderscript.FieldPacker);

    method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker);

    method public void setFromFieldPacker(int, int, int, int, android.renderscript.FieldPacker);

    method public void setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener);

    method public void setSurface(android.view.Surface);

    method public void syncAll(int);

api/system-current.txt

+20 −0
Original line number Diff line number Diff line
@@ -28445,6 +28445,16 @@ package android.renderscript { 
    method public void copy1DRangeFromUnchecked(int, int, short[]);

    method public void copy1DRangeFromUnchecked(int, int, byte[]);

    method public void copy1DRangeFromUnchecked(int, int, float[]);

    method public void copy1DRangeTo(int, int, java.lang.Object);

    method public void copy1DRangeTo(int, int, int[]);

    method public void copy1DRangeTo(int, int, short[]);

    method public void copy1DRangeTo(int, int, byte[]);

    method public void copy1DRangeTo(int, int, float[]);

    method public void copy1DRangeToUnchecked(int, int, java.lang.Object);

    method public void copy1DRangeToUnchecked(int, int, int[]);

    method public void copy1DRangeToUnchecked(int, int, short[]);

    method public void copy1DRangeToUnchecked(int, int, byte[]);

    method public void copy1DRangeToUnchecked(int, int, float[]);

    method public void copy2DRangeFrom(int, int, int, int, java.lang.Object);

    method public void copy2DRangeFrom(int, int, int, int, byte[]);

    method public void copy2DRangeFrom(int, int, int, int, short[]);
@@ -28452,6 +28462,14 @@ package android.renderscript { 
    method public void copy2DRangeFrom(int, int, int, int, float[]);

    method public void copy2DRangeFrom(int, int, int, int, android.renderscript.Allocation, int, int);

    method public void copy2DRangeFrom(int, int, android.graphics.Bitmap);

    method public void copy2DRangeTo(int, int, int, int, java.lang.Object);

    method public void copy2DRangeTo(int, int, int, int, byte[]);

    method public void copy2DRangeTo(int, int, int, int, short[]);

    method public void copy2DRangeTo(int, int, int, int, int[]);

    method public void copy2DRangeTo(int, int, int, int, float[]);

    method public void copy3DRangeFrom(int, int, int, int, int, int, java.lang.Object);

    method public void copy3DRangeFrom(int, int, int, int, int, int, android.renderscript.Allocation, int, int, int);

    method public void copy3DRangeTo(int, int, int, int, int, int, java.lang.Object);

    method public void copyFrom(android.renderscript.BaseObj[]);

    method public void copyFrom(java.lang.Object);

    method public void copyFrom(int[]);
@@ -28471,6 +28489,7 @@ package android.renderscript { 
    method public void copyTo(short[]);

    method public void copyTo(int[]);

    method public void copyTo(float[]);

    method public void copyToFieldPacker(int, int, int, int, android.renderscript.FieldPacker);

    method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);

    method public static android.renderscript.Allocation createCubemapFromBitmap(android.renderscript.RenderScript, android.graphics.Bitmap);

    method public static android.renderscript.Allocation createCubemapFromCubeFaces(android.renderscript.RenderScript, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.graphics.Bitmap, android.renderscript.Allocation.MipmapControl, int);
@@ -28496,6 +28515,7 @@ package android.renderscript { 
    method public deprecated synchronized void resize(int);

    method public void setFromFieldPacker(int, android.renderscript.FieldPacker);

    method public void setFromFieldPacker(int, int, android.renderscript.FieldPacker);

    method public void setFromFieldPacker(int, int, int, int, android.renderscript.FieldPacker);

    method public void setOnBufferAvailableListener(android.renderscript.Allocation.OnBufferAvailableListener);

    method public void setSurface(android.view.Surface);

    method public void syncAll(int);

rs/java/android/renderscript/Allocation.java

+12 −26
Original line number Diff line number Diff line
@@ -802,7 +802,7 @@ public class Allocation extends BaseObj { 


    /**

     * This is only intended to be used by auto-generated code reflected from

     * the RenderScript script files.

     * the RenderScript script files and should not be used by developers.

     *

     * @param xoff

     * @param component_number
@@ -813,9 +813,8 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * This is only intended to be used by auto-generated code reflected from

     * the RenderScript script files.

     * the RenderScript script files and should not be used by developers.

     *

     * @param xoff

     * @param yoff
@@ -1247,8 +1246,11 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy a rectangular region from the array into the allocation.

     * The array is assumed to be tightly packed.

     *

     * The data type of the array is not required to be the same as

     * the element data type.

     */

    private void copy3DRangeFromUnchecked(int xoff, int yoff, int zoff, int w, int h, int d,

                                          Object array, Element.DataType dt, int arrayLen) {
@@ -1277,7 +1279,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy a rectangular region from the array into the allocation.

     * The array is assumed to be tightly packed.

     *
@@ -1298,7 +1299,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy a rectangular region into the allocation from another

     * allocation.

     *
@@ -1415,7 +1415,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * This is only intended to be used by auto-generated code reflected from

     * the RenderScript script files and should not be used by developers.

     *
@@ -1423,7 +1422,7 @@ public class Allocation extends BaseObj { 
     * @param yoff

     * @param zoff

     * @param component_number

     * @param array

     * @param fp

     */

    public void copyToFieldPacker(int xoff, int yoff, int zoff, int component_number, FieldPacker fp) {

        mRS.validate();
@@ -1501,7 +1500,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * guarantee that the Allocation is compatible with the input buffer.

     *
@@ -1516,7 +1514,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * guarantee that the Allocation is compatible with the input buffer.

     *
@@ -1529,7 +1526,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * guarantee that the Allocation is compatible with the input buffer.

     *
@@ -1542,7 +1538,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * guarantee that the Allocation is compatible with the input buffer.

     *
@@ -1555,7 +1550,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * guarantee that the Allocation is compatible with the input buffer.

     *
@@ -1569,7 +1563,6 @@ public class Allocation extends BaseObj { 




    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * and will generate exceptions if the Allocation type does not

     * match the component type of the array passed in.
@@ -1585,7 +1578,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * and will generate exceptions if the Allocation type is not a 32 bit

     * integer type.
@@ -1600,7 +1592,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * and will generate exceptions if the Allocation type is not a 16 bit

     * integer type.
@@ -1615,7 +1606,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * and will generate exceptions if the Allocation type is not an 8 bit

     * integer type.
@@ -1630,7 +1620,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy part of this Allocation into an array.  This method does not

     * and will generate exceptions if the Allocation type is not a 32 bit float

     * type.
@@ -1671,7 +1660,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy from a rectangular region in this Allocation into an array.

     *

     * @param xoff X offset of the region to copy in this Allocation
@@ -1687,7 +1675,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy from a rectangular region in this Allocation into an array.

     *

     * @param xoff X offset of the region to copy in this Allocation
@@ -1703,7 +1690,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy from a rectangular region in this Allocation into an array.

     *

     * @param xoff X offset of the region to copy in this Allocation
@@ -1719,7 +1705,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy from a rectangular region in this Allocation into an array.

     *

     * @param xoff X offset of the region to copy in this Allocation
@@ -1735,7 +1720,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Copy from a rectangular region in this Allocation into an array.

     *

     * @param xoff X offset of the region to copy in this Allocation
@@ -1752,8 +1736,11 @@ public class Allocation extends BaseObj { 




    /**

     * @hide

     * Copy from a rectangular region in this Allocation into an array.

     * The array is assumed to be tightly packed.

     *

     * The data type of the array is not required to be the same as

     * the element data type.

     */

    private void copy3DRangeToUnchecked(int xoff, int yoff, int zoff, int w, int h, int d,

                                        Object array, Element.DataType dt, int arrayLen) {
@@ -1780,8 +1767,7 @@ public class Allocation extends BaseObj { 
        Trace.traceEnd(RenderScript.TRACE_TAG);

    }



    /**

     * @hide

    /*

     * Copy from a rectangular region in this Allocation into an array.

     *

     * @param xoff X offset of the region to copy in this Allocation