commit 4463a4ef26b2eb62fae74568193fd07e97dedd4d
author Igor Murashkin <iam@google.com> Fri Jan 31 07:30:12 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 07:30:12 2014 -0800
tree 0eadb4e30d02fc3687aab86e64ac995d6dffe889
parent 5901ddeb525ed7691c382e8d17f47055d7d1e5db
parent e05b7b50e234e8ed2471f5ad96bb3d715067e9f3

am e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"

* commit 'e05b7b50e234e8ed2471f5ad96bb3d715067e9f3':
  EGL14.eglCreateWindowSurface should set producerControlledByApp

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