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

Commit 5d237d5a authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Apply merged transactions using the BBQ apply token" into main

parents 80418c13 7345cbbf

libs/gui/BLASTBufferQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1032,7 +1032,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.