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

Commit 7345cbbf authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Apply merged transactions using the BBQ apply token 

This avoids any possibilities of transactions being applied out of order.

Flag: EXEMPT bug fix
Bug: 362400679
Test: presubmit
Change-Id: Id5d2ae7076c4007390f0b8aadf9587ca4301323b
parent 7ed019e0

libs/gui/BLASTBufferQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void BLASTBufferQueue::mergeWithNextTransaction(SurfaceComposerClient::Transacti 
    std::lock_guard _lock{mMutex};

    if (mLastAcquiredFrameNumber >= frameNumber) {

        // Apply the transaction since we have already acquired the desired frame.

        t->apply();

        t->setApplyToken(mApplyToken).apply();

    } else {

        mPendingTransactions.emplace_back(frameNumber, *t);

        // Clear the transaction so it can't be applied elsewhere.