commit 094efb3f5350b3ce95dcc790bc237c5caa901a20
author Christopher Tate <ctate@android.com> Wed Jan 22 17:43:52 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 22 17:43:52 2014 -0800
tree 6bd9220b7978b835447f5a79909a8f1613662099
parent 0e3df21642122ae8a43be1a35723782bdd417b7a
parent 407f74f494e5374d9bdceae9d9fb453aa8270f6b

am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"

* commit '407f74f494e5374d9bdceae9d9fb453aa8270f6b':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value

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