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

Commit 104aff50 authored by Miao Wang's avatar Miao Wang Committed by Android (Google) Code Review
Browse files

Merge "[RenderScript] Unhide new Allocation APIs"

parents d11c15d4 c29bcd0d

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -32433,6 +32433,7 @@ package android.renderscript { 
    method public void copyTo(short[]);

    method public void copyTo(int[]);

    method public void copyTo(float[]);

    method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int);

    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);
@@ -32448,9 +32449,12 @@ package android.renderscript { 
    method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);

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

    method public void generateMipmaps();

    method public java.nio.ByteBuffer getByteBuffer();

    method public int getBytesSize();

    method public android.renderscript.Element getElement();

    method public long getStride();

    method public android.view.Surface getSurface();

    method public long getTimeStamp();

    method public android.renderscript.Type getType();

    method public int getUsage();

    method public void ioReceive();

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -34659,6 +34659,7 @@ package android.renderscript { 
    method public void copyTo(short[]);

    method public void copyTo(int[]);

    method public void copyTo(float[]);

    method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int);

    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);
@@ -34674,9 +34675,12 @@ package android.renderscript { 
    method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);

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

    method public void generateMipmaps();

    method public java.nio.ByteBuffer getByteBuffer();

    method public int getBytesSize();

    method public android.renderscript.Element getElement();

    method public long getStride();

    method public android.view.Surface getSurface();

    method public long getTimeStamp();

    method public android.renderscript.Type getType();

    method public int getUsage();

    method public void ioReceive();

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -32447,6 +32447,7 @@ package android.renderscript { 
    method public void copyTo(short[]);

    method public void copyTo(int[]);

    method public void copyTo(float[]);

    method public static android.renderscript.Allocation[] createAllocations(android.renderscript.RenderScript, android.renderscript.Type, int, int);

    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);
@@ -32462,9 +32463,12 @@ package android.renderscript { 
    method public static android.renderscript.Allocation createTyped(android.renderscript.RenderScript, android.renderscript.Type, int);

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

    method public void generateMipmaps();

    method public java.nio.ByteBuffer getByteBuffer();

    method public int getBytesSize();

    method public android.renderscript.Element getElement();

    method public long getStride();

    method public android.view.Surface getSurface();

    method public long getTimeStamp();

    method public android.renderscript.Type getType();

    method public int getUsage();

    method public void ioReceive();

rs/java/android/renderscript/Allocation.java

+0 −4
Original line number Diff line number Diff line
@@ -2074,7 +2074,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Gets or creates a ByteBuffer that contains the raw data of the current Allocation.

     * If the Allocation is created with USAGE_IO_INPUT, the returned ByteBuffer

     * would contain the up-to-date data as READ ONLY.
@@ -2109,7 +2108,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Creates a new Allocation Array with the given {@link

     * android.renderscript.Type}, and usage flags.

     * Note: If the input allocation is of usage: USAGE_IO_INPUT,
@@ -2211,7 +2209,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Gets the stride of the Allocation.

     * For a 2D or 3D Allocation, the raw data maybe padded so that each row of

     * the Allocation has certain alignment. The size of each row including such
@@ -2229,7 +2226,6 @@ public class Allocation extends BaseObj { 
    }



    /**

     * @hide

     * Get the timestamp for the most recent buffer held by this Allocation.

     * The timestamp is guaranteed to be unique and monotonically increasing.

     * Default value: -1. The timestamp will be updated after each {@link