commit 149510e010b46a445355a8d7fcdb8401125b92c3
author Narayan Kamath <narayan@google.com> Fri Jan 31 07:30:15 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 07:30:15 2014 -0800
tree 7c3b9f2179d5c00fbc1e3fe4b59755ac225e7846
parent 4463a4ef26b2eb62fae74568193fd07e97dedd4d
parent b9f960e094d53440be5c7e8759a74dbb0ab57317

am b9f960e0: Merge "Fixed cancel() not working correctly"

* commit 'b9f960e094d53440be5c7e8759a74dbb0ab57317':
  Fixed cancel() not working correctly

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