summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-04-06 16:58:57 -0700
committerYang Ni <yangni@google.com>2015-04-07 09:37:50 -0700
commit1709856238c61a2103a4827df1786f1d63fcd744 (patch)
treeb2e8db1417773e015838bab344371e587af2d8c6 /rs
parent33f8d0976fc91d0bc64ccd41c86566e0ec0fbb89 (diff)
downloadframeworks_base-1709856238c61a2103a4827df1786f1d63fcd744.zip
frameworks_base-1709856238c61a2103a4827df1786f1d63fcd744.tar.gz
frameworks_base-1709856238c61a2103a4827df1786f1d63fcd744.tar.bz2
Add a name to ScriptGroup2.Builder.create method
The name is not used in any meaningful way yet, but would be used to name the file for generated code for fused kernels in other coming CLs. A script group name cannot be null or empty, or longer than 100 characters. It can only contain letters, digits, '-', or '_'. Change-Id: I95fdbf58e6689da91ca98c2057dfa1a803d3b27b
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/ScriptGroup2.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup2.java b/rs/java/android/renderscript/ScriptGroup2.java
index 9d73ac4..e762eb7 100644
--- a/rs/java/android/renderscript/ScriptGroup2.java
+++ b/rs/java/android/renderscript/ScriptGroup2.java
@@ -549,11 +549,17 @@ public class ScriptGroup2 extends BaseObj {
/**
* Creates a script group
*
+ * @param name name for the script group. Legal names can only contain letters, digits,
+ * '-', or '_'. The name can be no longer than 100 characters.
* @param outputs futures intended as outputs of the script group
* @return a script group
*/
- public ScriptGroup2 create(Future... outputs) {
+ public ScriptGroup2 create(String name, Future... outputs) {
+ if (name == null || name.isEmpty() || name.length() > 100 ||
+ !name.equals(name.replaceAll("[^a-zA-Z0-9-]", "_"))) {
+ throw new RSIllegalArgumentException("invalid script group name");
+ }
ScriptGroup2 ret = new ScriptGroup2(mRS, mClosures, mInputs, outputs);
return ret;
}