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

Commit 3d18fadf authored by Miao Wang's avatar Miao Wang Committed by Android Git Automerger
Browse files

am 27ab3e86: am 3f7ae095: am cb556e0d: Merge "[RenderScript] hide... 

am 27ab3e86: am 3f7ae095: am cb556e0d: Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev

* commit '27ab3e86':
  [RenderScript] hide Allocation.copyToFieldPacker()
parents a46f549f 27ab3e86

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -27233,7 +27233,6 @@ 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);

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -29247,7 +29247,6 @@ 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);

rs/java/android/renderscript/Allocation.java

+2 −0
Original line number Diff line number Diff line
@@ -1422,6 +1422,8 @@ 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.

     *