commit eeca435dc6134a285b9bbb832cd6a1a88f34e85f
author Shih-wei Liao <sliao@google.com> Mon Dec 20 20:45:56 2010 +0800
committer Shih-wei Liao <sliao@google.com> Mon Dec 20 21:02:32 2010 +0800
tree 0c7650ef80ade830a7892e867afe777a64187780
parent b70c82dc45f62a1c257a80e7aa9e0ecfe063c1be

Stale cache management to address a P1 bug # 3296131.

Change-Id: I593f35a91c4a14c055828f8989fe01b9e7790039

graphics/jni/android_renderscript_RenderScript.cpp

diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index 493653a..9da4428 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -902,12 +902,14 @@
 }
 
 static jint
-nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con, jstring resName, jstring cacheDir)
+nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con, jstring packageName, jstring resName, jstring cacheDir)
 {
     LOG_API("nScriptCCreate, con(%p)", con);
+    const char* packageNameUTF = _env->GetStringUTFChars(packageName, NULL);
     const char* resNameUTF = _env->GetStringUTFChars(resName, NULL);
     const char* cacheDirUTF = _env->GetStringUTFChars(cacheDir, NULL);
-    jint i = (jint)rsScriptCCreate(con, resNameUTF, cacheDirUTF);
+    jint i = (jint)rsScriptCCreate(con, packageNameUTF, resNameUTF, cacheDirUTF);
+    _env->ReleaseStringUTFChars(packageName, packageNameUTF);
     _env->ReleaseStringUTFChars(resName, resNameUTF);
     _env->ReleaseStringUTFChars(cacheDir, cacheDirUTF);
     return i;
@@ -1301,7 +1303,7 @@
 
 {"rsnScriptCBegin",                  "(I)V",                                  (void*)nScriptCBegin },
 {"rsnScriptCSetScript",              "(I[BII)V",                              (void*)nScriptCSetScript },
-{"rsnScriptCCreate",                 "(ILjava/lang/String;Ljava/lang/String;)I",  (void*)nScriptCCreate },
+{"rsnScriptCCreate",                 "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I",  (void*)nScriptCCreate },
 
 {"rsnProgramStoreBegin",             "(III)V",                                (void*)nProgramStoreBegin },
 {"rsnProgramStoreDepthFunc",         "(II)V",                                 (void*)nProgramStoreDepthFunc },