Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 797caaff authored by Xin Li's avatar Xin Li
Browse files

Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: I33574b3ff347264a19e2e0bcfd2236639aad01a5
Change-Id: I831130d2f8ed1ad917f24dea48cf6e2d55b91b7c
parents e713cc13 38e8c45f
Loading
Loading
Loading
Loading
+3 −3
Original line number Original line Diff line number Diff line
@@ -3171,12 +3171,12 @@ void SurfaceFlinger::onCompositionPresented(PhysicalDisplayId pacesetterId,


    const auto schedule = mScheduler->getVsyncSchedule();
    const auto schedule = mScheduler->getVsyncSchedule();
    const TimePoint vsyncDeadline = schedule->vsyncDeadlineAfter(presentTime);
    const TimePoint vsyncDeadline = schedule->vsyncDeadlineAfter(presentTime);
    const Period vsyncPeriod = schedule->period();
    const Fps renderRate = pacesetterDisplay->refreshRateSelector().getActiveMode().fps;
    const nsecs_t vsyncPhase =
    const nsecs_t vsyncPhase =
            mScheduler->getVsyncConfiguration().getCurrentConfigs().late.sfOffset;
            mScheduler->getVsyncConfiguration().getCurrentConfigs().late.sfOffset;


    const CompositorTiming compositorTiming(vsyncDeadline.ns(), vsyncPeriod.ns(), vsyncPhase,
    const CompositorTiming compositorTiming(vsyncDeadline.ns(), renderRate.getPeriodNsecs(),
                                            presentLatency.ns());
                                            vsyncPhase, presentLatency.ns());


    ui::DisplayMap<ui::LayerStack, const DisplayDevice*> layerStackToDisplay;
    ui::DisplayMap<ui::LayerStack, const DisplayDevice*> layerStackToDisplay;
    {
    {