commit 42e4aee598d2eceab6fc20fc9801b5c2fbf2e50d
author Tim Murray <timmurray@google.com> Mon Feb 03 14:41:27 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 03 14:41:27 2014 -0800
tree d966e1d8d31f986eee8abf62aaf58ebbae3ea7d7
parent 42955bab2a275f3ea22d5a50b556cec88697a573
parent 0539b7b4116622d33c91dbaa9a3040c7a3a703d6

am 0539b7b4: Merge "Enable asynchronous destruction of BaseObjs."

* commit '0539b7b4116622d33c91dbaa9a3040c7a3a703d6':
  Enable asynchronous destruction of BaseObjs.

rs/jni/android_renderscript_RenderScript.cpp

diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 64b3876..918a76e 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -392,7 +392,7 @@
     jint len = 0;
     if (data) {
         len = _env->GetArrayLength(data);
-        ptr = _env->GetIntArrayElements(data, NULL);
+        jint *ptr = _env->GetIntArrayElements(data, NULL);
     }
     LOG_API("nContextSendMessage, con(%p), id(%i), len(%i)", (RsContext)con, id, len);
     rsContextSendMessage((RsContext)con, id, (const uint8_t *)ptr, len * sizeof(int));