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

Commit b513a04f authored by Marissa Wall's avatar Marissa Wall Committed by android-build-merger
Browse files

Merge "TransactionCallbacks: don't send callbacks until applied" into qt-dev am: 2f3b6776

am: ac2d08ea

Change-Id: I70421bdc6a81d4794e43b1526a5f11bd5ce4e0c0
parents b7398327 ac2d08ea
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -2172,7 +2172,14 @@ void SurfaceFlinger::postComposition()
    }

    mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);

    // Lock the mStateLock in case SurfaceFlinger is in the middle of applying a transaction.
    // If we do not lock here, a callback could be sent without all of its SurfaceControls and
    // metrics.
    {
        Mutex::Autolock _l(mStateLock);
        mTransactionCompletedThread.sendCallbacks();
    }

    if (mLumaSampling && mRegionSamplingThread) {
        mRegionSamplingThread->notifyNewContent();