commit dfd4f5232c87c51fe639b594fd210b4073eca42b
author Narayan Kamath <narayan@google.com> Wed Jan 29 07:26:19 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 29 07:26:19 2014 -0800
tree 8c8af0d2fc6be0f1dd64b8f69515f721966e3dde
parent 7be33110ea3e1a032ee3aa7c50f1dedf52fcab25
parent d228a03891f60520d517b2a3bc900b008b2da702

am d228a038: Merge "mNativeCanvas is long, not int."

* commit 'd228a03891f60520d517b2a3bc900b008b2da702':
  mNativeCanvas is long, not int.

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