summaryrefslogtreecommitdiffstats
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorYang Ni <yangni@google.com>2015-04-14 16:15:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-14 16:15:54 +0000
commit8704ae464a001e17275257d19eae688ff3a28892 (patch)
tree13d552700167874e6c593051aa1259eead66ea90 /rs/java/android/renderscript/RenderScript.java
parent3312c6b9f3e9c83865eeec2af609338ce74a0a10 (diff)
parent35be56cce821d86f69026398ff9433e2d173b02f (diff)
downloadframeworks_base-8704ae464a001e17275257d19eae688ff3a28892.zip
frameworks_base-8704ae464a001e17275257d19eae688ff3a28892.tar.gz
frameworks_base-8704ae464a001e17275257d19eae688ff3a28892.tar.bz2
Merge "Add name to ScriptGroup2.Builder.create() method"
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
-rw-r--r--rs/java/android/renderscript/RenderScript.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java
index 126b8c7..9f3348c 100644
--- a/rs/java/android/renderscript/RenderScript.java
+++ b/rs/java/android/renderscript/RenderScript.java
@@ -332,10 +332,12 @@ public class RenderScript {
rsnClosureSetGlobal(mContext, closureID, fieldID, value, size);
}
- native long rsnScriptGroup2Create(long con, String cachePath, long[] closures);
- synchronized long nScriptGroup2Create(String cachePath, long[] closures) {
+ native long rsnScriptGroup2Create(long con, String name, String cachePath,
+ long[] closures);
+ synchronized long nScriptGroup2Create(String name, String cachePath,
+ long[] closures) {
validate();
- return rsnScriptGroup2Create(mContext, cachePath, closures);
+ return rsnScriptGroup2Create(mContext, name, cachePath, closures);
}
native void rsnScriptGroup2Execute(long con, long groupID);