diff options
| -rw-r--r-- | services/surfaceflinger/Scheduler/RefreshRateSelector.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp index bc0d448d45..0e3b771fc6 100644 --- a/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp +++ b/services/surfaceflinger/Scheduler/RefreshRateSelector.cpp @@ -973,14 +973,18 @@ ftl::Optional<FrameRateMode> RefreshRateSelector::onKernelTimerChanged( ftl::Optional<DisplayModeId> desiredModeIdOpt, bool timerExpired) const { std::lock_guard lock(mLock); - const auto current = [&]() REQUIRES(mLock) -> FrameRateMode { - if (desiredModeIdOpt) { - const auto& modePtr = mDisplayModes.get(*desiredModeIdOpt)->get(); - return FrameRateMode{modePtr->getPeakFps(), ftl::as_non_null(modePtr)}; - } - - return getActiveModeLocked(); - }(); + const auto current = + desiredModeIdOpt + .and_then([this](DisplayModeId modeId) + REQUIRES(mLock) { return mDisplayModes.get(modeId); }) + .transform([](const DisplayModePtr& modePtr) { + return FrameRateMode{modePtr->getPeakFps(), ftl::as_non_null(modePtr)}; + }) + .or_else([this] { + ftl::FakeGuard guard(mLock); + return std::make_optional(getActiveModeLocked()); + }) + .value(); const DisplayModePtr& min = mMinRefreshRateModeIt->second; if (current.modePtr->getId() == min->getId()) { |