commit 19dd0366f010857d9fba2b86707e27950bfe2001
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Nov 26 18:00:34 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 26 18:00:34 2024 +0000
tree 72f916ecd80bcec993eb7ee5e0fa1e3e10d44eab
parent e2c594e5089e6aa3828e091f5cc19aba11c09566
parent 0f4730319627d7630976ba229058164979b4baee

Merge "SF: VsyncTimeline::isVSyncInPhase should use display rate [unflagged]" into android15-tests-dev

services/surfaceflinger/Scheduler/VSyncPredictor.cpp

diff --git a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp
index dd3c4b0..1422cfa 100644
--- a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp
+++ b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp
@@ -737,9 +737,7 @@
         return ticks<std::milli, float>(TimePoint::fromNs(timePoint) - now);
     };
 
-    Fps displayFps = !FlagManager::getInstance().vrr_bugfix_24q4() && mRenderRateOpt
-            ? *mRenderRateOpt
-            : Fps::fromPeriodNsecs(mIdealPeriod.ns());
+    Fps displayFps = Fps::fromPeriodNsecs(mIdealPeriod.ns());
     const auto divisor = RefreshRateSelector::getFrameRateDivisor(displayFps, frameRate);
     const auto now = TimePoint::now();