commit 70986e197bbaf4de4f8126519a75df2b057c3b52
author Narayan Kamath <narayan@google.com> Thu Jan 30 02:39:21 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 30 02:39:21 2014 -0800
tree 145a9fccad4369ce8c781fe11b5051ad7e0be7a0
parent fa2e16e36d95d5cf0848a28a98ac4566321fc119
parent ab71f8b68fee0f2a4f2049c4345b5334948c9df9

am ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"

* commit 'ab71f8b68fee0f2a4f2049c4345b5334948c9df9':
  AArch64: Use of long for pointers in PropertyValuesHolder

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