commit d7b71ac5337c06dd3c368dc796d8ab17597818e7
author Anton Ivanov <aii@google.com> Tue Mar 18 13:41:02 2025 -0700
committer Anton Ivanov <aii@google.com> Thu Mar 20 01:07:51 2025 -0700
tree 0c7c6e19d9e3bdc6ffe494a25c87a16cb396adab
parent bcbec20c069ccb1f3d2faa34aec1857aec06bc8f

Revert^2 "Use TransactionState in SurfaceFlinger."

This reverts commit 4f8b4f371947dce3abece1c0d64af0b5c990e0c2.

Reason for revert: Rolling forward with fix for use-after-move in
SurfaceFlinger::setTransactionState

Flag: EXEMPT refactor
Bug: 385156191
Test: presubmit

Change-Id: I66d45b1e125dcb50cbe7a3cfcefa8eaa02705419

libs/gui/BLASTBufferQueue.cpp

diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index 1aae13c..5b0f21d 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -1032,7 +1032,7 @@
         // Apply the transaction since we have already acquired the desired frame.
         t->setApplyToken(mApplyToken).apply();
     } else {
-        mPendingTransactions.emplace_back(frameNumber, *t);
+        mPendingTransactions.emplace_back(frameNumber, std::move(*t));
         // Clear the transaction so it can't be applied elsewhere.
         t->clear();
     }
@@ -1050,8 +1050,8 @@
 void BLASTBufferQueue::mergePendingTransactions(SurfaceComposerClient::Transaction* t,
                                                 uint64_t frameNumber) {
     auto mergeTransaction =
-            [&t, currentFrameNumber = frameNumber](
-                    std::tuple<uint64_t, SurfaceComposerClient::Transaction> pendingTransaction) {
+            [t, currentFrameNumber = frameNumber](
+                    std::pair<uint64_t, SurfaceComposerClient::Transaction>& pendingTransaction) {
                 auto& [targetFrameNumber, transaction] = pendingTransaction;
                 if (currentFrameNumber < targetFrameNumber) {
                     return false;