commit fa2e16e36d95d5cf0848a28a98ac4566321fc119
author Narayan Kamath <narayan@google.com> Thu Jan 30 02:34:38 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 30 02:34:38 2014 -0800
tree 18a6c05a038d181c08d803298dd2b8473623c405
parent cb7cdd5053ab37e3b606eb313e8b482a2047091a
parent 54190ec8307ebb83d02b7d9b8edc80a042792de6

am 54190ec8: Merge "change Surface constructor arg to 64bit"

* commit '54190ec8307ebb83d02b7d9b8edc80a042792de6':
  change Surface constructor arg to 64bit

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