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

Commit e8339fb8 authored by Zhijun He's avatar Zhijun He
Browse files

Camera API1: fix AE state check in precapture state 

It is legal to transit to CONVERGED or FLASH_REQUIRED after a AE precapture
trigger.

Bug: 17365185
Change-Id: Id041eff5eac564c32d09b547a0139d24807336f4
parent c2aa6971

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

+12 −5
Original line number Diff line number Diff line
@@ -445,11 +445,18 @@ CaptureSequencer::CaptureState CaptureSequencer::manageStandardPrecaptureWait( 
    if (mNewAEState) {

        if (!mAeInPrecapture) {

            // Waiting to see PRECAPTURE state

            if (mAETriggerId == mTriggerId &&

                    mAEState == ANDROID_CONTROL_AE_STATE_PRECAPTURE) {

            if (mAETriggerId == mTriggerId) {

                if (mAEState == ANDROID_CONTROL_AE_STATE_PRECAPTURE) {

                    ALOGV("%s: Got precapture start", __FUNCTION__);

                    mAeInPrecapture = true;

                    mTimeoutCount = kMaxTimeoutsForPrecaptureEnd;

                } else if (mAEState == ANDROID_CONTROL_AE_STATE_CONVERGED ||

                        mAEState == ANDROID_CONTROL_AE_STATE_FLASH_REQUIRED) {

                    // It is legal to transit to CONVERGED or FLASH_REQUIRED

                    // directly after a trigger.

                    ALOGV("%s: AE is already in good state, start capture", __FUNCTION__);

                    return STANDARD_CAPTURE;

                }

            }

        } else {

            // Waiting to see PRECAPTURE state end