summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-04-16 00:35:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-16 00:35:23 +0000
commita217d69d05efb4c3637d9eaf510bafc52e0ffa4a (patch)
treefd72e3067d847db235a65aec76ce38510b61e7b6 /rs
parentb1a3946712da0c4913179fb0a55d8a71b6afc6be (diff)
parentd016266de2cefe12853dbf4a81292b96bb4150b1 (diff)
downloadframeworks_base-a217d69d05efb4c3637d9eaf510bafc52e0ffa4a.zip
frameworks_base-a217d69d05efb4c3637d9eaf510bafc52e0ffa4a.tar.gz
frameworks_base-a217d69d05efb4c3637d9eaf510bafc52e0ffa4a.tar.bz2
Merge "Hide array allocation"
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/AllocationAdapter.java2
-rw-r--r--rs/java/android/renderscript/Type.java3
2 files changed, 4 insertions, 1 deletions
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