commit f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839
author Brian Carlstrom <bdc@google.com> Wed Dec 18 23:16:17 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 18 23:16:17 2013 -0800
tree 282f610498b2b27f77e3c32959d32d7f2749454d
parent acf7b5d24a98dc97b551e205bf7638f47d9304c0
parent a11371f42b4dd793a48faa3323be34bca0f6d2e6

am a11371f4: Merge "Track Looper decoupling from ALooper"

* commit 'a11371f42b4dd793a48faa3323be34bca0f6d2e6':
  Track Looper decoupling from ALooper

graphics/jni/android_renderscript_RenderScript.cpp

diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index a4221dc..cbc4e5a 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -335,7 +335,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)", con, id, len);
     rsContextSendMessage(con, id, (const uint8_t *)ptr, len * sizeof(int));