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

Commit 585549bc authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

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

* commit 'df2bc296':
  Camera2: Don't use ZSL when flash is on force fire mode.
parents 43d0199a df2bc296

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;