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

Commit 7a11ffe0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Don't cancel AF when the device is disconnected" into main

parents ecc4987d a907221c

services/camera/libcameraservice/api1/Camera2Client.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,11 @@ status_t Camera2Client::cancelAutoFocus() { 
    int triggerId;

    {

        SharedParameters::Lock l(mParameters);

        if (l.mParameters.state == Parameters::DISCONNECTED) {

            ALOGE("%s: Camera %d has been disconnected.", __FUNCTION__, mCameraId);

            return INVALID_OPERATION;

        }



        // Canceling does nothing in FIXED or INFINITY modes

        if (l.mParameters.focusMode == Parameters::FOCUS_MODE_FIXED ||

                l.mParameters.focusMode == Parameters::FOCUS_MODE_INFINITY) {