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

Commit 011ccffb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Wait for the status tracker idle fence" into main am: 502ad30e 

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



Change-Id: Ib6e5bd979707ee18b7c49fb9b4cb8c468fe3a89e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78602c48 502ad30e

services/camera/libcameraservice/device3/StatusTracker.cpp

+11 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ bool StatusTracker::threadLoop() { 
        }

    }



    bool waitForIdleFence = false;

    // After new pending states appear, or timeout, check if we're idle.  Even

    // with timeout, need to check to account for fences that may still be

    // clearing out
@@ -196,6 +197,7 @@ bool StatusTracker::threadLoop() { 
            ssize_t idx = mStates.indexOfKey(newState.id);

            // Ignore notices for unknown components

            if (idx >= 0) {

                bool validFence = newState.fence != Fence::NO_FENCE;

                // Update single component state

                mStates.replaceValueAt(idx, newState.state);

                mIdleFence = Fence::merge(String8("idleFence"),
@@ -204,6 +206,8 @@ bool StatusTracker::threadLoop() { 
                ComponentState newState = getDeviceStateLocked();

                if (newState != prevState) {

                    mStateTransitions.add(newState);

                } else if (validFence && !waitForIdleFence) {

                    waitForIdleFence = true;

                }

                prevState = newState;

            }
@@ -227,6 +231,13 @@ bool StatusTracker::threadLoop() { 
    }

    mStateTransitions.clear();



    if (waitForIdleFence) {

        auto ret = mIdleFence->wait(kWaitDuration);

        if (ret == NO_ERROR) {

            mComponentsChanged = true;

        }

    }



    return true;

}