commit 0a21341999e809f240bd9d8764720825cee1f4f2
author Yi Kong <yikong@google.com> Wed Dec 13 23:58:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 13 23:58:31 2023 +0000
tree f01149ce670a348e76b2136f13b9e525dd4c3d07
parent 6b49dcea7fce263a59160cc29d7a478278cfd511
parent 330be7fa00c5e79563f3831fbb8b15fac076429e

Merge "surfaceflinger: Fix -Wunused-variable compiler warning" into main am: 330be7fa00

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2869276

Change-Id: I9ab01d3f7a9fe7db629ab48d05a6280b43c4528e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/Scheduler/Scheduler.cpp

diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp
index 68927bd..54ff2cd 100644
--- a/services/surfaceflinger/Scheduler/Scheduler.cpp
+++ b/services/surfaceflinger/Scheduler/Scheduler.cpp
@@ -577,7 +577,8 @@
     if (!scheduleOpt) return;
     const auto& schedule = scheduleOpt->get();
 
-    if (const bool needMoreSignals = schedule->getController().addPresentFence(std::move(fence))) {
+    const bool needMoreSignals = schedule->getController().addPresentFence(std::move(fence));
+    if (needMoreSignals) {
         schedule->enableHardwareVsync();
     } else {
         constexpr bool kDisallow = false;