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

Commit 2f4d1e0d authored by Bharatt Kukreja's avatar Bharatt Kukreja Committed by Android (Google) Code Review
Browse files

Merge "Mark a component as idle before reconfigure camera is called"

parents 5664546f d55c7a5e

services/camera/libcameraservice/device3/Camera3Device.cpp

+4 −1
Original line number Diff line number Diff line
@@ -2232,7 +2232,6 @@ bool Camera3Device::reconfigureCamera(const CameraMetadata& sessionParams, int c 
    if (mStatus == STATUS_ACTIVE) {

        markClientActive = true;

        mPauseStateNotify = true;

        mStatusTracker->markComponentIdle(clientStatusId, Fence::NO_FENCE);



        rc = internalPauseAndWaitLocked(maxExpectedDuration);

    }
@@ -3449,6 +3448,10 @@ bool Camera3Device::RequestThread::threadLoop() { 
        if (res == OK) {

            sp<Camera3Device> parent = mParent.promote();

            if (parent != nullptr) {

                sp<StatusTracker> statusTracker = mStatusTracker.promote();

                if (statusTracker != nullptr) {

                    statusTracker->markComponentIdle(mStatusId, Fence::NO_FENCE);

                }

                mReconfigured |= parent->reconfigureCamera(mLatestSessionParams, mStatusId);

            }

            setPaused(false);