diff options
| author | Miao Wang <miaowang@google.com> | 2015-05-11 21:13:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 21:13:47 +0000 |
| commit | cb556e0d25d4be11f5441c9b23c96633cfd4ca95 (patch) | |
| tree | d01732b276c7dfbe4c5ce00c0dcba714654e8e09 | |
| parent | 51506326d1629ed6e1423c11ff2238c6f19b742f (diff) | |
| parent | 3c61327fa990c2ea79527fd18fb9e448d39e1622 (diff) | |
| download | frameworks_base-cb556e0d25d4be11f5441c9b23c96633cfd4ca95.zip frameworks_base-cb556e0d25d4be11f5441c9b23c96633cfd4ca95.tar.gz frameworks_base-cb556e0d25d4be11f5441c9b23c96633cfd4ca95.tar.bz2 | |
Merge "[RenderScript] hide Allocation.copyToFieldPacker()" into mnc-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | rs/java/android/renderscript/Allocation.java | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index e9e2d04..1b2e2e0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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); diff --git a/api/system-current.txt b/api/system-current.txt index 5ff1b99..fe0f874 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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); diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 3b61f9d..70a5821 100644 --- a/rs/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -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. * |