diff options
| author | Jason Sams <jsams@google.com> | 2015-04-16 00:35:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-16 00:35:23 +0000 |
| commit | a217d69d05efb4c3637d9eaf510bafc52e0ffa4a (patch) | |
| tree | fd72e3067d847db235a65aec76ce38510b61e7b6 | |
| parent | b1a3946712da0c4913179fb0a55d8a71b6afc6be (diff) | |
| parent | d016266de2cefe12853dbf4a81292b96bb4150b1 (diff) | |
| download | frameworks_base-a217d69d05efb4c3637d9eaf510bafc52e0ffa4a.zip frameworks_base-a217d69d05efb4c3637d9eaf510bafc52e0ffa4a.tar.gz frameworks_base-a217d69d05efb4c3637d9eaf510bafc52e0ffa4a.tar.bz2 | |
Merge "Hide array allocation"
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | rs/java/android/renderscript/AllocationAdapter.java | 2 | ||||
| -rw-r--r-- | rs/java/android/renderscript/Type.java | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt index dbee2f2..0490ff2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27262,7 +27262,6 @@ package android.renderscript { method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation); method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation); method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type); - method public void setArray(int, int); method public void setFace(android.renderscript.Type.CubemapFace); method public void setLOD(int); method public void setX(int); @@ -28085,8 +28084,6 @@ package android.renderscript { method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int); method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int); method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int); - method public int getArray(int); - method public int getArrayCount(); method public int getCount(); method public android.renderscript.Element getElement(); method public int getX(); @@ -28100,7 +28097,6 @@ package android.renderscript { public static class Type.Builder { ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element); method public android.renderscript.Type create(); - method public android.renderscript.Type.Builder setArray(int, int); method public android.renderscript.Type.Builder setFaces(boolean); method public android.renderscript.Type.Builder setMipmaps(boolean); method public android.renderscript.Type.Builder setX(int); diff --git a/api/system-current.txt b/api/system-current.txt index df2cbf8..d932ad1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -29265,7 +29265,6 @@ package android.renderscript { method public static android.renderscript.AllocationAdapter create1D(android.renderscript.RenderScript, android.renderscript.Allocation); method public static android.renderscript.AllocationAdapter create2D(android.renderscript.RenderScript, android.renderscript.Allocation); method public static android.renderscript.AllocationAdapter createTyped(android.renderscript.RenderScript, android.renderscript.Allocation, android.renderscript.Type); - method public void setArray(int, int); method public void setFace(android.renderscript.Type.CubemapFace); method public void setLOD(int); method public void setX(int); @@ -30088,8 +30087,6 @@ package android.renderscript { method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int); method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int); method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int); - method public int getArray(int); - method public int getArrayCount(); method public int getCount(); method public android.renderscript.Element getElement(); method public int getX(); @@ -30103,7 +30100,6 @@ package android.renderscript { public static class Type.Builder { ctor public Type.Builder(android.renderscript.RenderScript, android.renderscript.Element); method public android.renderscript.Type create(); - method public android.renderscript.Type.Builder setArray(int, int); method public android.renderscript.Type.Builder setFaces(boolean); method public android.renderscript.Type.Builder setMipmaps(boolean); method public android.renderscript.Type.Builder setX(int); diff --git a/rs/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java index 35d59dd..9bfd6ec 100644 --- a/rs/java/android/renderscript/AllocationAdapter.java +++ b/rs/java/android/renderscript/AllocationAdapter.java @@ -208,7 +208,7 @@ public class AllocationAdapter extends Allocation { } /** - * + * @hide */ public void setArray(int arrayNum, int arrayVal) { if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) { diff --git a/rs/java/android/renderscript/Type.java b/rs/java/android/renderscript/Type.java index cc9b58b..dc23785 100644 --- a/rs/java/android/renderscript/Type.java +++ b/rs/java/android/renderscript/Type.java @@ -150,6 +150,7 @@ public class Type extends BaseObj { } /** + * @hide * Return the dimension of the specified array. * * @param arrayNum The array dimension to query @@ -169,6 +170,7 @@ public class Type extends BaseObj { } /** + * @hide * Return the number of array dimensions. * * @return int @@ -382,6 +384,7 @@ public class Type extends BaseObj { } /** + * @hide * Adds an array dimension to the builder * * @param dim |