commit 2d2d594308693af79bf5c44f0dcc30f29d2dc31a
author Narayan Kamath <narayan@google.com> Thu Dec 19 04:37:52 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 19 04:37:52 2013 -0800
tree 4b2a5f9135efebd7a2f574fb299c2e42c5c23d18
parent f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839
parent f3172c623e4bb77a047262c6e7eedc4a2c2ea95a

am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int."

* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
  MediaDrm#mNativeContext is a long, not int.

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