Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c6750cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "camera2 jni: nativeReadValues() can use... 

Merge "Revert "camera2 jni: nativeReadValues() can use camera_metadata_ro_entry instead of camera_metadata_entry"" into main
parents 52cf8b9a 8d0896c3

core/jni/android_hardware_camera2_CameraMetadata.cpp

+10 −8
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static void CameraMetadata_swap(JNIEnv *env, jclass thiz, jlong ptr, jlong other 
static jbyteArray CameraMetadata_readValues(JNIEnv *env, jclass thiz, jint tag, jlong ptr) {

    ALOGV("%s (tag = %d)", __FUNCTION__, tag);



    const CameraMetadata *metadata = CameraMetadata_getPointerThrow(env, ptr);

    CameraMetadata* metadata = CameraMetadata_getPointerThrow(env, ptr);

    if (metadata == NULL) return NULL;



    const camera_metadata_t *metaBuffer = metadata->getAndLock();
@@ -349,14 +349,16 @@ static jbyteArray CameraMetadata_readValues(JNIEnv *env, jclass thiz, jint tag, 
    }

    size_t tagSize = Helpers::getTypeSize(tagType);



    camera_metadata_ro_entry entry = metadata->find(tag);

    camera_metadata_entry entry = metadata->find(tag);

    if (entry.count == 0) {

         if (!metadata->exists(tag)) {

             ALOGV("%s: Tag %d does not have any entries", __FUNCTION__, tag);

             return NULL;

         } else {

            ALOGV("%s: Tag %d had an entry, but it had 0 data", __FUNCTION__, tag);

             // OK: we will return a 0-sized array.

             ALOGV("%s: Tag %d had an entry, but it had 0 data", __FUNCTION__,

                   tag);

         }

        return NULL;

    }



    jsize byteCount = entry.count * tagSize;