summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-04-15 17:18:10 -0700
committerJason Sams <jsams@google.com>2015-04-15 17:18:10 -0700
commitd016266de2cefe12853dbf4a81292b96bb4150b1 (patch)
tree955eb7d117d081daadadfceee94e91bad569dbd4
parent1740c625c6b2b39d6b35d08a7bd362ea907cf082 (diff)
downloadframeworks_base-d016266de2cefe12853dbf4a81292b96bb4150b1.zip
frameworks_base-d016266de2cefe12853dbf4a81292b96bb4150b1.tar.gz
frameworks_base-d016266de2cefe12853dbf4a81292b96bb4150b1.tar.bz2
Hide array allocation
Not done for feature complete Change-Id: I79c8da2c7e64d6feb660c9652688f971535c1f92
-rw-r--r--api/current.txt4
-rw-r--r--api/system-current.txt4
-rw-r--r--rs/java/android/renderscript/AllocationAdapter.java2
-rw-r--r--rs/java/android/renderscript/Type.java3
4 files changed, 4 insertions, 9 deletions
diff --git a/api/current.txt b/api/current.txt
index fdeda0b..264a783 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -27198,7 +27198,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);
@@ -28021,8 +28020,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();
@@ -28036,7 +28033,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 deaf916..5bb382e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -29197,7 +29197,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);
@@ -30020,8 +30019,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();
@@ -30035,7 +30032,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