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

Commit a67ced97 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "CameraService: API1: Fix flash mode" into lmp-dev

parents a8a4eeb9 248f9ce1

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -622,8 +622,8 @@ status_t Parameters::initialize(const CameraMetadata *info, int deviceVersion) { 
    camera_metadata_ro_entry_t availableAeModes =

    camera_metadata_ro_entry_t availableAeModes =

        staticInfo(ANDROID_CONTROL_AE_AVAILABLE_MODES, 0, 0, false);

        staticInfo(ANDROID_CONTROL_AE_AVAILABLE_MODES, 0, 0, false);





    if (isFlashAvailable) {

    flashMode = Parameters::FLASH_MODE_OFF;

    flashMode = Parameters::FLASH_MODE_OFF;

    if (isFlashAvailable) {

        params.set(CameraParameters::KEY_FLASH_MODE,

        params.set(CameraParameters::KEY_FLASH_MODE,

                CameraParameters::FLASH_MODE_OFF);

                CameraParameters::FLASH_MODE_OFF);