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

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

am 8318c786: am 2b890936: Merge "Camera2/3: Support new PASSIVE_UNFOCUSED AF state" into klp-dev 

* commit '8318c786':
  Camera2/3: Support new PASSIVE_UNFOCUSED AF state
parents ebf0e057 8318c786

services/camera/libcameraservice/api1/Camera2Client.cpp

+3 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ status_t Camera2Client::dump(int fd, const Vector<String16>& args) { 
        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_INACTIVE)

        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_PASSIVE_SCAN)

        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_PASSIVE_FOCUSED)

        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_PASSIVE_UNFOCUSED)

        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_ACTIVE_SCAN)

        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_FOCUSED_LOCKED)

        CASE_APPEND_ENUM(ANDROID_CONTROL_AF_STATE_NOT_FOCUSED_LOCKED)
@@ -1487,6 +1488,7 @@ void Camera2Client::notifyAutoFocus(uint8_t newState, int triggerId) { 
                    case ANDROID_CONTROL_AF_STATE_INACTIVE:

                    case ANDROID_CONTROL_AF_STATE_PASSIVE_SCAN:

                    case ANDROID_CONTROL_AF_STATE_PASSIVE_FOCUSED:

                    case ANDROID_CONTROL_AF_STATE_PASSIVE_UNFOCUSED:

                    default:

                        // Unexpected in AUTO/MACRO mode

                        ALOGE("%s: Unexpected AF state transition in AUTO/MACRO mode: %d",
@@ -1529,6 +1531,7 @@ void Camera2Client::notifyAutoFocus(uint8_t newState, int triggerId) { 
                        afInMotion = true;

                        // no break

                    case ANDROID_CONTROL_AF_STATE_PASSIVE_FOCUSED:

                    case ANDROID_CONTROL_AF_STATE_PASSIVE_UNFOCUSED:

                        // Stop passive scan, inform upstream

                        if (l.mParameters.enableFocusMoveMessages) {

                            sendMovingMessage = true;