commit 3dfa15c49b4c78cdf3bf1af79e9b307596455708
author Nick Kralevich <nnk@google.com> Wed Jan 29 10:03:53 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 29 10:03:53 2014 -0800
tree 8277e7ff87dea2de41827ab70df2544737fb52b0
parent 2d35ba4d4a43036706638ca0e96e5e1a9904d2af
parent db3278ab429860161e5baa26f141de95a48de0cb

am db3278ab: Merge "Map SELinux log levels to Android log levels."

* commit 'db3278ab429860161e5baa26f141de95a48de0cb':
  Map SELinux log levels to Android log levels.

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