| commit | 03ceb6d3ba3031e8f7f43eff9b56c0c1aecd5445 | [log] [tgz] |
|---|---|---|
| author | Ady Abraham <adyabr@google.com> | Mon Jul 29 18:02:13 2024 +0000 |
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | Wed Jul 31 08:32:27 2024 +0000 |
| tree | c3fd8ecd41b6fb43a043bf4897aa325051c87587 | |
| parent | 228a3dd8a2b19ce2a990334483905f80942a2b52 [diff] [blame] |
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
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();