commit 992065938a95e5273b22dea009b8581bcc693e61
author Mike Lockwood <lockwood@google.com> Wed Jan 08 07:59:06 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 08 07:59:06 2014 -0800
tree ddfa0958d508ea6c678791c64c118d29738bdc92
parent c156021debb8e13324e451cb288da7edd7e112ca
parent 9607d78f5144792993bd254a4b5983b2a9d5bf83

am 9607d78f: Merge "Added missing USB device descriptor fields needed for intent filters"

* commit '9607d78f5144792993bd254a4b5983b2a9d5bf83':
  Added missing USB device descriptor fields needed for intent filters

graphics/jni/android_renderscript_RenderScript.cpp

diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index a4221dc..cbc4e5a 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));