commit 38e8c45f13ce32b0dcecb25141ffecaf386fa17f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 16 12:24:18 2025 -0800
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 16 12:24:18 2025 -0800
tree 75b468e14204ea9198ae888857c044386ae9355c
parent 206ba4109464d7fd8ede177c589979acf3deb1d5
parent dd5c2148e97dcf68577a84d6162618e0e5ce4936

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31297418'] into 25Q1-release.

Change-Id: I9efb43bac3f24619d3f485d6694d40a2bc40bc7e

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index d7d567c..896d13d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3171,12 +3171,12 @@
 
     const auto schedule = mScheduler->getVsyncSchedule();
     const TimePoint vsyncDeadline = schedule->vsyncDeadlineAfter(presentTime);
-    const Period vsyncPeriod = schedule->period();
+    const Fps renderRate = pacesetterDisplay->refreshRateSelector().getActiveMode().fps;
     const nsecs_t vsyncPhase =
             mScheduler->getVsyncConfiguration().getCurrentConfigs().late.sfOffset;
 
-    const CompositorTiming compositorTiming(vsyncDeadline.ns(), vsyncPeriod.ns(), vsyncPhase,
-                                            presentLatency.ns());
+    const CompositorTiming compositorTiming(vsyncDeadline.ns(), renderRate.getPeriodNsecs(),
+                                            vsyncPhase, presentLatency.ns());
 
     ui::DisplayMap<ui::LayerStack, const DisplayDevice*> layerStackToDisplay;
     {