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

Commit b40c761d authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Stop waiting if device enters ERROR state" into udc-dev am: da909306 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/23589138



Change-Id: Ia0959292c9b9ae9a80eb7329438dd766c1d159cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 224c3be2 da909306

services/camera/libcameraservice/device3/Camera3Device.cpp

+9 −0
Original line number Diff line number Diff line
@@ -1645,6 +1645,10 @@ status_t Camera3Device::waitUntilStateThenRelock(bool active, nsecs_t timeout, 
    bool stateSeen = false;

    nsecs_t startTime = systemTime();

    do {

        if (mStatus == STATUS_ERROR) {

            // Device in error state. Return right away.

            break;

        }

        if (active == (mStatus == STATUS_ACTIVE) &&

            (requestThreadInvocation || !mStatusIsInternal)) {

            // Desired state is current
@@ -1674,6 +1678,11 @@ status_t Camera3Device::waitUntilStateThenRelock(bool active, nsecs_t timeout, 
        // they are not paused. This avoids intermediate pause signals from reconfigureCamera as it

        // changes the status to active right after.

        for (size_t i = startIndex; i < mRecentStatusUpdates.size(); i++) {

            if (mRecentStatusUpdates[i].status == STATUS_ERROR) {

                // Device in error state. Return right away.

                stateSeen = true;

                break;

            }

            if (active == (mRecentStatusUpdates[i].status == STATUS_ACTIVE) &&

                (requestThreadInvocation || !mRecentStatusUpdates[i].isInternal)) {

                stateSeen = true;