Merge change 6846 into donut

* changes:
  Avoid memcpy's by using GetPrimitiveArrayCritical.

1 files changed, 2 insertions, 2 deletions

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 57b5aa632b8d..b841076637d4 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -143,9 +143,9 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int
                 LOGE("Couldn't allocate byte array for JPEG data");
                 env->ExceptionClear();
             } else {
-                jbyte *bytes = env->GetByteArrayElements(obj, NULL);
+                jbyte *bytes = static_cast<jbyte*>(env->GetPrimitiveArrayCritical(obj, NULL));
                 memcpy(bytes, data, size);
-                env->ReleaseByteArrayElements(obj, bytes, 0);
+                env->ReleasePrimitiveArrayCritical(obj, bytes, 0);
 
             }
         } else {