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

Commit 603b12ef authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera2: Swap AF notification order, minor bug fix. 

In continuous AF modes, when an AF trigger/cancel is received in the
middle of a passive AF scan, we want to send both an AF move stop
callback and an AF done callback. Swap the order of sending to
simplify life when the app just wants to pay attention to the AF done
callback during an active AF trigger.

Bug: 6243944
Change-Id: I127d1675bc37ef828ef89c70b8cfab75f9428a2f
parent 174181ee

services/camera/libcameraservice/Camera2Client.cpp

+3 −4
Original line number Diff line number Diff line
@@ -1790,14 +1790,13 @@ void Camera2Client::notifyAutoFocus(uint8_t newState, int triggerId) { 
                }

        }

    }

    if (sendCompletedMessage) {

        mCameraClient->notifyCallback(CAMERA_MSG_FOCUS, success ? 1 : 0, 0);

    }

    if (sendMovingMessage) {

        mCameraClient->notifyCallback(CAMERA_MSG_FOCUS_MOVE,

                afInMotion ? 1 : 0, 0);

    }



    if (sendCompletedMessage) {

        mCameraClient->notifyCallback(CAMERA_MSG_FOCUS, success ? 1 : 0, 0);

    }

}



void Camera2Client::notifyAutoExposure(uint8_t newState, int triggerId) {

services/camera/libcameraservice/Camera2Device.cpp

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ status_t Camera2Device::dump(int fd, const Vector<String16>& args) { 
        }

    }



    result.appendFormat("  Camera2Device[%d] dump (detail level %d):\n", mId);

    result.appendFormat("  Camera2Device[%d] dump (detail level %d):\n",

            mId, detailLevel);



    if (detailLevel > 0) {

        result = "    Request queue contents:\n";