commit cb556e0d25d4be11f5441c9b23c96633cfd4ca95
author Miao Wang <miaowang@google.com> Mon May 11 21:13:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 11 21:13:47 2015 +0000
tree d01732b276c7dfbe4c5ce00c0dcba714654e8e09
parent 51506326d1629ed6e1423c11ff2238c6f19b742f
parent 3c61327fa990c2ea79527fd18fb9e448d39e1622

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

api/current.txt

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

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

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 @@
     }
 
     /**
+     * @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.
      *