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

Commit 80ef94b5 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh
Browse files

cameraservice: update supportedFocusModes for api1 

Do not list infinity focus mode if the focuser is not calibrated.

bug 13933979

Change-Id: I677ed22305703ac09eeaf986f5bc2a680cececd8
parent 47bf8d8f

services/camera/libcameraservice/api1/client2/Parameters.cpp

+11 −2
Original line number Diff line number Diff line
@@ -640,8 +640,17 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 
        focusMode = Parameters::FOCUS_MODE_AUTO;

        params.set(CameraParameters::KEY_FOCUS_MODE,

                CameraParameters::FOCUS_MODE_AUTO);

        String8 supportedFocusModes(CameraParameters::FOCUS_MODE_INFINITY);

        bool addComma = true;

        String8 supportedFocusModes;

        bool addComma = false;

        camera_metadata_ro_entry_t focusDistanceCalibration =

            staticInfo(ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION, 0, 0, false);



        if (focusDistanceCalibration.count &&

                focusDistanceCalibration.data.u8[0] !=

                ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED) {

            supportedFocusModes += CameraParameters::FOCUS_MODE_INFINITY;

            addComma = true;

        }



        for (size_t i=0; i < availableAfModes.count; i++) {

            if (addComma) supportedFocusModes += ",";