commit 0da716bedb8d61afdb46d1871e3eea5c580c8fa2
author Jiawen Chen <jiawen@google.com> Tue Jan 28 15:31:08 2020 -0500
committer Jiawen Chen <jiawen@google.com> Wed Jan 29 11:05:46 2020 -0500
tree fbdb964c4dde886db167017aaff08ef3ecd8f1ed
parent 9d73033022f883101e17bed172ee63b421fd011e

Fix ACameraMetadata_fromCameraMetadata crash.

Root cause was that jclass instances acquired from JNIEnv::FindClass are
not pinned and become invalidated due to Java garbage collection. Adding
a new global ref pins the pointer.

FIXED=148174094

Test: atest android.hardware.camera2.cts.CameraManagerTest#testCameraCharacteristicsNdkFromSdk android.hardware.camera2.cts.CaptureResultTest#testCameraCaptureResultAllKeys
Test: atest NativeCameraDeviceTest NativeCameraManagerTest NativeImageReaderTest NativeStillCaptureTest

Change-Id: Id0601b9c01e1a58485e3b039a87a5cf56a19e0af

camera/ndk/NdkCameraMetadata.cpp

diff --git a/camera/ndk/NdkCameraMetadata.cpp b/camera/ndk/NdkCameraMetadata.cpp
index 99691ed..1fec3e1 100644
--- a/camera/ndk/NdkCameraMetadata.cpp
+++ b/camera/ndk/NdkCameraMetadata.cpp
@@ -50,24 +50,31 @@
         if (cameraMetadataClazz == nullptr) {
             return false;
         }
-        android_hardware_camera2_CameraMetadata_getNativeMetadataPtr =
+        const jmethodID cameraMetadata_getNativeMetadataPtr =
             env->GetMethodID(cameraMetadataClazz, "getNativeMetadataPtr", "()J");
-        if (android_hardware_camera2_CameraMetadata_getNativeMetadataPtr == nullptr) {
+        if (cameraMetadata_getNativeMetadataPtr == nullptr) {
             return false;
         }
 
-        android_hardware_camera2_CameraCharacteristics_clazz = env->FindClass(
+        const jclass cameraCharacteristics_clazz = env->FindClass(
             android_hardware_camera2_CameraCharacteristics_jniClassName);
-        if (android_hardware_camera2_CameraCharacteristics_clazz == nullptr) {
+        if (cameraCharacteristics_clazz == nullptr) {
             return false;
         }
 
-        android_hardware_camera2_CaptureResult_clazz = env->FindClass(
+        const jclass captureResult_clazz = env->FindClass(
             android_hardware_camera2_CaptureResult_jniClassName);
-        if (android_hardware_camera2_CaptureResult_clazz == nullptr) {
+        if (captureResult_clazz == nullptr) {
             return false;
         }
 
+        android_hardware_camera2_CameraMetadata_getNativeMetadataPtr =
+            cameraMetadata_getNativeMetadataPtr;
+        android_hardware_camera2_CameraCharacteristics_clazz =
+            static_cast<jclass>(env->NewGlobalRef(cameraCharacteristics_clazz));
+        android_hardware_camera2_CaptureResult_clazz =
+            static_cast<jclass>(env->NewGlobalRef(captureResult_clazz));
+
         return true;
     }();
     return ok;