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

Commit 201ffa0f authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: allow shifted camera metadata for some interface" into oc-dev 

am: e9e78196

Change-Id: Id2f51d322991991da037a435f6fc032aa2e1a321
parents 37a30e86 e9e78196

services/camera/libcameraservice/common/CameraProviderManager.cpp

+9 −2
Original line number Diff line number Diff line
@@ -912,8 +912,15 @@ CameraProviderManager::ProviderInfo::DeviceInfo3::DeviceInfo3(const std::string& 
                if (s == Status::OK) {

                    camera_metadata_t *buffer =

                            reinterpret_cast<camera_metadata_t*>(metadata.data());

                    size_t expectedSize = metadata.size();

                    int res = validate_camera_metadata_structure(buffer, &expectedSize);

                    if (res == OK || res == CAMERA_METADATA_VALIDATION_SHIFTED) {

                        set_camera_metadata_vendor_id(buffer, mProviderTagid);

                        mCameraCharacteristics = buffer;

                    } else {

                        ALOGE("%s: Malformed camera metadata received from HAL", __FUNCTION__);

                        status = Status::INTERNAL_ERROR;

                    }

                }

            });

    if (!ret.isOk()) {

services/camera/libcameraservice/device3/Camera3Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3180,7 +3180,7 @@ status_t Camera3Device::HalInterface::constructDefaultRequestSettings( 
                                reinterpret_cast<const camera_metadata_t*>(request.data());

                        size_t expectedSize = request.size();

                        int ret = validate_camera_metadata_structure(r, &expectedSize);

                        if (ret == OK) {

                        if (ret == OK || ret == CAMERA_METADATA_VALIDATION_SHIFTED) {

                            *requestTemplate = clone_camera_metadata(r);

                            if (*requestTemplate == nullptr) {

                                ALOGE("%s: Unable to clone camera metadata received from HAL",