commit 85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f
author Kenny Root <kroot@google.com> Fri Jan 31 14:58:53 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 14:58:53 2014 -0800
tree 23102d572a67d6152e6bd6304749ad713fb20234
parent 77a1986c69760583f05eabbf7dac7c25dd8b7e7b
parent c064a1b5d9a68bb5513e6ed64a067ab822e98764

am c064a1b5: Merge "Remove DRLCertFactory"

* commit 'c064a1b5d9a68bb5513e6ed64a067ab822e98764':
  Remove DRLCertFactory

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