commit a97d59db082fa06f7c4f1af319cf517ca8e0ef69
author Shuangxi Xiang <xiangshuangxi@xiaomi.corp-partner.google.com> Tue Aug 27 07:28:20 2024 +0000
committer Sally Qi <sallyqi@google.com> Tue Sep 10 20:20:11 2024 -0700
tree 8d0f7ec67cae27f09982b92790ccd9e3ecdca513
parent 05f45ce7ebd164564f1f9e7be89aef11f0347473

Remove the redundant parameters in applyTransactionsLocked

In the major Android version upgrade from 13 to 14, the addCommittedTransactions function in the applyTransactionsLocked function that requires the vsyncId parameter has been moved to the updateLayerSnapshots and updateLayerSnapshotsLegacy functions. The rest of the operations in the applyTransactionsLocked function no longer require the vsyncId parameter, so the declaration and definition information about vsyncId in the applyTransactionsLocked function can be removed here.

Bug: 362415544
Test: builds
Flag: EXEMPT bugfix
Change-Id: Ic4ded171e90bcfb7a0d58df2c272f4c219be3a04
Signed-off-by: xiangshuangxi@xiaomi.corp-partner.google.com

services/surfaceflinger/SurfaceFlinger.h

diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index 414088e..ad3f24f 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -783,9 +783,9 @@
             REQUIRES(mStateLock, kMainThreadContext);
     // Flush pending transactions that were presented after desiredPresentTime.
     // For test only
-    bool flushTransactionQueues(VsyncId) REQUIRES(kMainThreadContext);
+    bool flushTransactionQueues() REQUIRES(kMainThreadContext);
 
-    bool applyTransactions(std::vector<TransactionState>&, VsyncId) REQUIRES(kMainThreadContext);
+    bool applyTransactions(std::vector<TransactionState>&) REQUIRES(kMainThreadContext);
     bool applyAndCommitDisplayTransactionStatesLocked(std::vector<TransactionState>& transactions)
             REQUIRES(kMainThreadContext, mStateLock);
 
@@ -815,7 +815,7 @@
 
     static LatchUnsignaledConfig getLatchUnsignaledConfig();
     bool shouldLatchUnsignaled(const layer_state_t&, size_t numStates, bool firstTransaction) const;
-    bool applyTransactionsLocked(std::vector<TransactionState>& transactions, VsyncId)
+    bool applyTransactionsLocked(std::vector<TransactionState>& transactions)
             REQUIRES(mStateLock, kMainThreadContext);
     uint32_t setDisplayStateLocked(const DisplayState& s) REQUIRES(mStateLock);
     uint32_t addInputWindowCommands(const InputWindowCommands& inputWindowCommands)