DO NOT MERGE - Fix improper declaration/use of pointer.
https://code.google.com/p/android/issues/detail?id=61547
This variable is shadowing the outer "ptr" declaration, resulting in a
potential NULL pointer being passed to the message API.
Change-Id: If96bfae8d5e874e12597182678a180ba137b78da
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index cbc4e5a..a4221dc 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);
- jint *ptr = _env->GetIntArrayElements(data, NULL);
+ 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));