Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev

Browse Source
This commit is contained in:
Miao Wang
2015-05-11 21:13:46 +00:00
committed by Android (Google) Code Review
parent 51506326d1 3c61327fa9
commit cb556e0d25
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -27230,7 +27230,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);

1
api/system-current.txt
View File

@@ -29244,7 +29244,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);

2
rs/java/android/renderscript/Allocation.java
View File

@@ -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.
*