commit 23abbfbb814501b825edc056027270f03f39506b
author Narayan Kamath <narayan@google.com> Tue Jan 28 11:15:57 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 11:15:57 2014 -0800
tree 4a7032f16a5beb12dc71f92bf236aaa42e6e5282
parent aa9ba887371e875ffbde49f43fa12bb5f123425b
parent 154614abbcc819c265bfb79b2626fcee66333ac2

am 154614ab: Merge "AArch64: Use long for pointers in graphics/Camera"

* commit '154614abbcc819c265bfb79b2626fcee66333ac2':
  AArch64: Use long for pointers in graphics/Camera

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