commit 9af955744d4e0d82b61fc99a932b9a5cf28b5df7
author Narayan Kamath <narayan@google.com> Fri Jan 31 07:30:18 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 07:30:18 2014 -0800
tree 96ba772704222fba819529e280e3c02f3db9b12f
parent 149510e010b46a445355a8d7fcdb8401125b92c3
parent 1cadc07dd1e3711fb1e57548038e3026682c5ef8

am 1cadc07d: Merge "Change ResourceType cookies to int32_t."

* commit '1cadc07dd1e3711fb1e57548038e3026682c5ef8':
  Change ResourceType cookies to int32_t.

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