summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-05-11 11:41:55 -0700
committerMiao Wang <miaowang@google.com>2015-05-11 11:51:09 -0700
commit3c61327fa990c2ea79527fd18fb9e448d39e1622 (patch)
tree646f21cb56816de25df81a88a7e25165f827c269
parent08cba16a59c442619ec952e7ce251e4038eb8322 (diff)
downloadframeworks_base-3c61327fa990c2ea79527fd18fb9e448d39e1622.zip
frameworks_base-3c61327fa990c2ea79527fd18fb9e448d39e1622.tar.gz
frameworks_base-3c61327fa990c2ea79527fd18fb9e448d39e1622.tar.bz2
[RenderScript] hide Allocation.copyToFieldPacker()
bug: 21027883 Change-Id: I122392bc5206ff19ea52712576d7f363e5915231
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--rs/java/android/renderscript/Allocation.java2
3 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index ef2c4da..7f91ceb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27277,7 +27277,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 4508b20..40a4ffb 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -29291,7 +29291,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.
*