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

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

Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev

parents 75dce94a 6b367f2a

services/camera/libcameraservice/camera2/CaptureSequencer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStart( 
        nextState = BURST_CAPTURE_START;

    }

    else if (l.mParameters.zslMode &&

            l.mParameters.state == Parameters::STILL_CAPTURE) {

            l.mParameters.state == Parameters::STILL_CAPTURE &&

            l.mParameters.flashMode != Parameters::FLASH_MODE_ON) {

        nextState = ZSL_START;

    } else {

        nextState = STANDARD_START;