From 03ceb6d3ba3031e8f7f43eff9b56c0c1aecd5445 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 29 Jul 2024 18:02:13 +0000 Subject: SF: VsyncTimeline::isVSyncInPhase should use display rate [unflagged] Remove the flag for the fix in commit 4a719e88f8050713cc75d655f3e75473e5404327 so it will be enabled on 24Q3 release. Bug: 328352850 Bug: 355684882 Test: see b/355684882 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e55f685fedaf3c215b646c92d567d722d95c02e) Merged-In: I02deca58bfd9a2cf169c2e58995cc42eeb854c8d Change-Id: I02deca58bfd9a2cf169c2e58995cc42eeb854c8d --- services/surfaceflinger/Scheduler/VSyncPredictor.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp index dd3c4b074c..1422cfa1d5 100644 --- a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp +++ b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp @@ -737,9 +737,7 @@ bool VSyncPredictor::VsyncTimeline::isVSyncInPhase(Model model, nsecs_t vsync, F return ticks(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(); -- cgit v1.2.3-59-g8ed1b