commit 2db26788ab367f08cb5378d77e22e8939e7a28c2
author Narayan Kamath <narayan@google.com> Tue Jan 14 02:13:45 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 14 02:13:45 2014 -0800
tree 8db7f8ee490afb255539ebbaff3756a662362100
parent 8021316010fb4bd18a29751949eb2cda66199b6e
parent e71afc2ea72e98c4631e79cad65f678090da87d3

am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""

* commit 'e71afc2ea72e98c4631e79cad65f678090da87d3':
  Revert "Hide AssetInputStream.getAssetInt."

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