commit 94000c4a0f349042e070ba1e096b564c753c68ba
author Dominik Laskowski <domlaskowski@google.com> Thu Mar 17 12:55:14 2022 -0700
committer Dominik Laskowski <domlaskowski@google.com> Wed Mar 23 11:24:36 2022 -0700
tree f4c4be7943096cbcacfaa7e4296a0706d18fee77
parent dd5827a6df564385a208b3c17d4ef0466d119d08

SF: Simplify setTransactionFlags

Merge overloads and remove unused return value.

Bug: 185535769
Test: Build
Change-Id: If2fe712614181e82bbe219775745a1ee7af2e210

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 1b8d0d5..cfe520e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3676,16 +3676,13 @@
     return mTransactionFlags.fetch_and(~mask) & mask;
 }
 
-uint32_t SurfaceFlinger::setTransactionFlags(uint32_t mask) {
-    return setTransactionFlags(mask, TransactionSchedule::Late);
-}
-
-uint32_t SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule schedule,
-                                             const sp<IBinder>& applyToken) {
-    const uint32_t old = mTransactionFlags.fetch_or(mask);
+void SurfaceFlinger::setTransactionFlags(uint32_t mask, TransactionSchedule schedule,
+                                         const sp<IBinder>& applyToken) {
     modulateVsync(&VsyncModulator::setTransactionSchedule, schedule, applyToken);
-    if ((old & mask) == 0) scheduleCommit(FrameHint::kActive);
-    return old;
+
+    if (const bool scheduled = mTransactionFlags.fetch_or(mask) & mask; !scheduled) {
+        scheduleCommit(FrameHint::kActive);
+    }
 }
 
 bool SurfaceFlinger::stopTransactionProcessing(