SF: VsyncTimeline::isVSyncInPhase should use display rate [unflagged]
Remove the flag for the fix in commit 4a719e88f8050713cc75d655f3e75473e5404327 so it will be enabled on android15-tests-dev (GSI) release.
Bug: 328352850
Bug: 355684882
Bug: 380359880
Test: see b/355684882
Flags: EXEMPT bugfix
Change-Id: I02deca58bfd9a2cf169c2e58995cc42eeb854c8d
Merged-In: I02deca58bfd9a2cf169c2e58995cc42eeb854c8d
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();