summaryrefslogtreecommitdiffstats
path: root/rs/java/android
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-05-12 21:25:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 21:25:29 +0000
commit20e16f4f762ddaf8a3574ad03c3f3a9f97a44637 (patch)
tree090b61743da623d50eab477fe4de6bef018783a4 /rs/java/android
parent115cdd488b616965437709df5002d5e935e3b980 (diff)
parent43563896061bd70f83b10325c2642d1b97b26df5 (diff)
downloadframeworks_base-20e16f4f762ddaf8a3574ad03c3f3a9f97a44637.zip
frameworks_base-20e16f4f762ddaf8a3574ad03c3f3a9f97a44637.tar.gz
frameworks_base-20e16f4f762ddaf8a3574ad03c3f3a9f97a44637.tar.bz2
Merge "Elaborate on description of ScriptGroup.execute" into mnc-dev
Diffstat (limited to 'rs/java/android')
-rw-r--r--rs/java/android/renderscript/ScriptGroup.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java
index be8b0fd..d1a12f9 100644
--- a/rs/java/android/renderscript/ScriptGroup.java
+++ b/rs/java/android/renderscript/ScriptGroup.java
@@ -400,8 +400,10 @@ public final class ScriptGroup extends BaseObj {
/**
* Executes a script group
*
- * @param inputs inputs to the script group
- * @return outputs of the script group as an array of objects
+ * @param inputs Values for inputs to the script group, in the order as the
+ * inputs are added via {@link Builder2#addInput}.
+ * @return Outputs of the script group as an array of objects, in the order
+ * as futures are passed to {@link Builder2#create}.
*/
public Object[] execute(Object... inputs) {