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

services/surfaceflinger/QueuedTransactionState.h

diff --git a/services/surfaceflinger/QueuedTransactionState.h b/services/surfaceflinger/QueuedTransactionState.h
index 86683da..6a17a0d 100644
--- a/services/surfaceflinger/QueuedTransactionState.h
+++ b/services/surfaceflinger/QueuedTransactionState.h
@@ -25,6 +25,7 @@
 #include <common/FlagManager.h>
 #include <ftl/flags.h>
 #include <gui/LayerState.h>
+#include <gui/TransactionState.h>
 #include <system/window.h>
 
 namespace android {
@@ -50,33 +51,26 @@
 struct QueuedTransactionState {
     QueuedTransactionState() = default;
 
-    QueuedTransactionState(const FrameTimelineInfo& frameTimelineInfo,
-                           std::vector<ResolvedComposerState>& composerStates,
-                           const Vector<DisplayState>& displayStates, uint32_t transactionFlags,
-                           const sp<IBinder>& applyToken,
-                           const InputWindowCommands& inputWindowCommands,
-                           int64_t desiredPresentTime, bool isAutoTimestamp,
-                           std::vector<uint64_t> uncacheBufferIds, int64_t postTime,
-                           bool hasListenerCallbacks,
-                           std::vector<ListenerCallbacks> listenerCallbacks, int originPid,
-                           int originUid, uint64_t transactionId,
-                           std::vector<uint64_t> mergedTransactionIds)
-          : frameTimelineInfo(frameTimelineInfo),
-            states(std::move(composerStates)),
-            displays(displayStates),
-            flags(transactionFlags),
-            applyToken(applyToken),
-            inputWindowCommands(inputWindowCommands),
-            desiredPresentTime(desiredPresentTime),
-            isAutoTimestamp(isAutoTimestamp),
+    QueuedTransactionState(TransactionState&& transactionState,
+                           std::vector<ResolvedComposerState>&& composerStates,
+                           std::vector<uint64_t>&& uncacheBufferIds, int64_t postTime,
+                           int originPid, int originUid)
+          : frameTimelineInfo(std::move(transactionState.mFrameTimelineInfo)),
+            states(composerStates),
+            displays(std::move(transactionState.mDisplayStates)),
+            flags(transactionState.mFlags),
+            applyToken(transactionState.mApplyToken),
+            inputWindowCommands(std::move(transactionState.mInputWindowCommands)),
+            desiredPresentTime(transactionState.mDesiredPresentTime),
+            isAutoTimestamp(transactionState.mIsAutoTimestamp),
             uncacheBufferIds(std::move(uncacheBufferIds)),
             postTime(postTime),
-            hasListenerCallbacks(hasListenerCallbacks),
-            listenerCallbacks(listenerCallbacks),
+            hasListenerCallbacks(transactionState.mHasListenerCallbacks),
+            listenerCallbacks(std::move(transactionState.mListenerCallbacks)),
             originPid(originPid),
             originUid(originUid),
-            id(transactionId),
-            mergedTransactionIds(std::move(mergedTransactionIds)) {}
+            id(transactionState.getId()),
+            mergedTransactionIds(std::move(transactionState.mMergedTransactionIds)) {}
 
     // Invokes `void(const layer_state_t&)` visitor for matching layers.
     template <typename Visitor>
@@ -135,7 +129,7 @@
 
     FrameTimelineInfo frameTimelineInfo;
     std::vector<ResolvedComposerState> states;
-    Vector<DisplayState> displays;
+    std::vector<DisplayState> displays;
     uint32_t flags;
     sp<IBinder> applyToken;
     InputWindowCommands inputWindowCommands;