commit 53321d9990cae810da28b7ae9f6f9b3fe7455020
author Narayan Kamath <narayan@google.com> Thu Jan 16 07:31:42 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 16 07:31:42 2014 -0800
tree c4e07cdd8cf95f2fc51819c68e869769990b7328
parent bc0468e67626937300e9afd182656469463d96a1
parent f19c50d6577b09ddabb5fa8c166b56c35ce2a66d

am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class"

* commit 'f19c50d6577b09ddabb5fa8c166b56c35ce2a66d':
  AArch64: Use long for pointers in KeyCharacterMap class

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));