summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-03-20 22:14:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-20 22:14:26 +0000
commit0590423d710a65c05ce8e8c65686f2ef4baae3e9 (patch)
tree090a7e9df001823d1328d3e37fdd97de9e8d7d51 /rs
parent3daef246bdbc43879b2db996c11e7ecc1b0a9eec (diff)
parent206666790ad35c5dcea3de1f85424ad6a5abbb4d (diff)
downloadframeworks_base-0590423d710a65c05ce8e8c65686f2ef4baae3e9.zip
frameworks_base-0590423d710a65c05ce8e8c65686f2ef4baae3e9.tar.gz
frameworks_base-0590423d710a65c05ce8e8c65686f2ef4baae3e9.tar.bz2
Merge "unhide AllocationAdapter APIs"
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/AllocationAdapter.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/AllocationAdapter.java b/rs/java/android/renderscript/AllocationAdapter.java
index 183726f..35d59dd 100644
--- a/rs/java/android/renderscript/AllocationAdapter.java
+++ b/rs/java/android/renderscript/AllocationAdapter.java
@@ -136,7 +136,7 @@ public class AllocationAdapter extends Allocation {
/**
- * @hide
+ *
* Set the active X. The x value must be within the range for
* the allocation being adapted.
*
@@ -208,7 +208,7 @@ public class AllocationAdapter extends Allocation {
}
/**
- * @hide
+ *
*/
public void setArray(int arrayNum, int arrayVal) {
if (mAdaptedAllocation.getType().getArray(arrayNum) == 0) {
@@ -242,7 +242,7 @@ public class AllocationAdapter extends Allocation {
}
/**
- * @hide
+ *
*
* Create an arbitrary window into the base allocation
* The type describes the shape of the window.