Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 07cd641b: Merge "Add a name to ScriptGroup2.Builder.create method"

Browse Source 
* commit '07cd641b6f832f939d5cccfe8604c230ddad4257':
  Add a name to ScriptGroup2.Builder.create method
This commit is contained in:
Yang Ni
2015-04-13 23:10:58 +00:00
committed by Android Git Automerger
parent f265bdbfc7 07cd641b6f
commit 7591574d84
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rs/java/android/renderscript/ScriptGroup2.java
View File

@@ -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;
}