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

Commit 93bd1026 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...

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

Change-Id: Ia95b268a7d6406ce278bc8a3fcabd3570758e135
parents ed8f830e b513a04f
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();