commit 77a1986c69760583f05eabbf7dac7c25dd8b7e7b
author Narayan Kamath <narayan@google.com> Fri Jan 31 07:30:21 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 07:30:21 2014 -0800
tree f222c204e4c584c3a7a1f4f1c56fb936a1601f1a
parent 9af955744d4e0d82b61fc99a932b9a5cf28b5df7
parent 49b7ba4dbc0b4984fc466bb98e9cfa40650db85b

am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
  AArch64: Make AssetManager and related classes 64-bit compatible

graphics/jni/android_renderscript_RenderScript.cpp

diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index aa16951..afba1a6 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));