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

Commit 6a07a725 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by Android (Google) Code Review
Browse files

Merge "Camera: fix invalid access of static_camera_characteristics"

parents 38bdc853 7768dedb

services/camera/libcameraservice/common/CameraModule.cpp

+6 −0
Original line number Diff line number Diff line
@@ -78,6 +78,12 @@ int CameraModule::getCameraInfo(int cameraId, struct camera_info *info) { 
        if (ret != 0) {

            return ret;

        }

        int deviceVersion = cameraInfo.device_version;

        if (deviceVersion < CAMERA_DEVICE_API_VERSION_2_0) {

            // static_camera_characteristics is invalid

            *info = rawInfo;

            return ret;

        }

        CameraMetadata m;

        m = rawInfo.static_camera_characteristics;

        deriveCameraCharacteristicsKeys(rawInfo.device_version, m);