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

Commit ca2c92b4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: verify per-frame metadata when ALOGV is enabled" into main am:... 

Merge "Camera: verify per-frame metadata when ALOGV is enabled" into main am: 3e28e52e am: 89c55997

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3481692



Change-Id: Iff214be6b9d51988f9d867010da9ddc082692b38
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62a111a6 89c55997

camera/CameraMetadata.cpp

+10 −6
Original line number Diff line number Diff line
@@ -132,10 +132,12 @@ void CameraMetadata::acquire(camera_metadata_t *buffer) { 
    clear();

    mBuffer = buffer;



    IF_ALOGV() {

        ALOGE_IF(validate_camera_metadata_structure(mBuffer, /*size*/NULL) != OK,

                 "%s: Failed to validate metadata structure %p",

                 __FUNCTION__, buffer);

    }

}



void CameraMetadata::acquire(CameraMetadata &other) {

    if (mLocked) {
@@ -712,10 +714,12 @@ status_t CameraMetadata::writeToParcel(Parcel& data, 


        // Not too big of a problem since receiving side does hard validation

        // Don't check the size since the compact size could be larger

        IF_ALOGV() {

            if (validate_camera_metadata_structure(metadata, /*size*/NULL) != OK) {

                ALOGW("%s: Failed to validate metadata %p before writing blob",

                       __FUNCTION__, metadata);

            }

        }



    } while(false);

    blob.release();