commit f7274fca5e36082674740bc6c976f73c4578d009
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 31 08:34:35 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 31 08:34:35 2024 +0000
tree c3fd8ecd41b6fb43a043bf4897aa325051c87587
parent 228a3dd8a2b19ce2a990334483905f80942a2b52
parent 03ceb6d3ba3031e8f7f43eff9b56c0c1aecd5445

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28535721'] into 24Q3-release.

Change-Id: Iaacc63e7a24129abec9b177624c86cd722aba8c8

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();