diff options
| author | 2024-12-12 11:02:42 -0800 | |
|---|---|---|
| committer | 2024-12-12 11:02:42 -0800 | |
| commit | 5d237d5afa1d767b63f5235f03d2e64708e5ed7f (patch) | |
| tree | 53cda19e71e31bb35826c65f3a2c9874b7ebeec2 /libs/gui/BLASTBufferQueue.cpp | |
| parent | 80418c13f8d2af6cb5add3dc17489f15afc43484 (diff) | |
| parent | 7345cbbf4daa74522481a12b52ab36156fe3fb8b (diff) | |
Merge "Apply merged transactions using the BBQ apply token" into main
Diffstat (limited to 'libs/gui/BLASTBufferQueue.cpp')
| -rw-r--r-- | libs/gui/BLASTBufferQueue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp index f476ce1238..38465b0de2 100644 --- a/libs/gui/BLASTBufferQueue.cpp +++ b/libs/gui/BLASTBufferQueue.cpp @@ -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. |