| commit | 7cdd0024073458bb63f3f71d9a4b02708a5339a1 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 13 15:24:39 2024 -0700 |
| committer | Xin Li <delphij@google.com> | Wed Aug 14 23:22:57 2024 -0700 |
| tree | 79d6edc6d950fd855215bdfd4fc471f0dbc57aa6 | |
| parent | ed53d61cc1b621bb03cc947f3d253e22dbce76ec [diff] | |
| parent | f7274fca5e36082674740bc6c976f73c4578d009 [diff] |
Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future Bug: 347831320 Merged-In: I40d73e79075893826492b85c27e35eed59b4b289 Change-Id: Ieb9d3bcbe2a941f32b4ca4d211022a82baded76d
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();