commit bc0468e67626937300e9afd182656469463d96a1
author Narayan Kamath <narayan@google.com> Thu Jan 16 07:31:39 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 16 07:31:39 2014 -0800
tree 5663d2e32ff450a1d9b7ea8cf32c437faa41dc4b
parent 12377887e3a74a69100071e0a383f6d9a54046c9
parent 6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e

am 6f17adba: Merge "AArch64: Use long for pointers in media classes"

* commit '6f17adbabc329db1671c2fa6fd9e25cbf6a3fa8e':
  AArch64: Use long for pointers in media classes

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