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

Commit 68f8c55d 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

Change-Id: I83099808f25dd15d1e43ba0ba9c4e90c364c4640
parents f011ae37 2f3b6776
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -2133,7 +2133,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();