summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-04-06 16:58:57 -0700
committerYang Ni <yangni@google.com>2015-04-13 14:32:18 -0700
commitad6b44aaa1a7837ff414f838ba6953e7e1a82d40 (patch)
tree5eead532a438948bafbd1d3932b25c05bb2fe48c
parentd1af38a4783c1c0d1a5b7c76a7583beb02a88462 (diff)
downloadframeworks_base-ad6b44aaa1a7837ff414f838ba6953e7e1a82d40.zip
frameworks_base-ad6b44aaa1a7837ff414f838ba6953e7e1a82d40.tar.gz
frameworks_base-ad6b44aaa1a7837ff414f838ba6953e7e1a82d40.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
-rw-r--r--rs/java/android/renderscript/ScriptGroup2.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/ScriptGroup2.java b/rs/java/android/renderscript/ScriptGroup2.java
index 857e9fb..9b92611 100644
--- a/rs/java/android/renderscript/ScriptGroup2.java
+++ b/rs/java/android/renderscript/ScriptGroup2.java
@@ -412,7 +412,11 @@ public class ScriptGroup2 extends BaseObj {
return addInvoke(invoke, args.toArray(), bindingMap);
}
- 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;
}