diff options
| author | Yi Kong <yikong@google.com> | 2023-12-14 01:04:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-14 01:04:03 +0000 |
| commit | a7de7549d87b7330e24b6f7514df501da870577f (patch) | |
| tree | f19f80f423cda378783652be18b3b924ce018726 | |
| parent | f2f5f26192e10045d780e03b4e199503b4ba98c2 (diff) | |
| parent | 0b3aa54af970fc43c97fd2bcd227fc1b32e9d38f (diff) | |
| download | native-a7de7549d87b7330e24b6f7514df501da870577f.tar.gz | |
Merge "surfaceflinger: Fix -Wunused-variable compiler warning" into main am: 330be7fa00 am: 0a21341999 am: 0b3aa54af9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2869276
Change-Id: Iccde558340a9f9f6ae3ddfd8c9cc55d544ef136a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/surfaceflinger/Scheduler/Scheduler.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/surfaceflinger/Scheduler/Scheduler.cpp b/services/surfaceflinger/Scheduler/Scheduler.cpp index 6a85788623..4357bb0b75 100644 --- a/services/surfaceflinger/Scheduler/Scheduler.cpp +++ b/services/surfaceflinger/Scheduler/Scheduler.cpp @@ -640,7 +640,8 @@ void Scheduler::addPresentFence(PhysicalDisplayId id, std::shared_ptr<FenceTime> 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; |