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

Commit 7cdd0024 authored by Xin Li's avatar Xin Li
Browse files

Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future 

Bug: 347831320
Merged-In: I40d73e79075893826492b85c27e35eed59b4b289
Change-Id: Ieb9d3bcbe2a941f32b4ca4d211022a82baded76d
parents ed53d61c f7274fca

services/surfaceflinger/Scheduler/VSyncPredictor.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -737,9 +737,7 @@ bool VSyncPredictor::VsyncTimeline::isVSyncInPhase(Model model, nsecs_t vsync, F 
        return ticks<std::milli, float>(TimePoint::fromNs(timePoint) - now);

        return ticks<std::milli, float>(TimePoint::fromNs(timePoint) - now);

    };

    };





    Fps displayFps = !FlagManager::getInstance().vrr_bugfix_24q4() && mRenderRateOpt

    Fps displayFps = Fps::fromPeriodNsecs(mIdealPeriod.ns());

            ? *mRenderRateOpt

            : Fps::fromPeriodNsecs(mIdealPeriod.ns());

    const auto divisor = RefreshRateSelector::getFrameRateDivisor(displayFps, frameRate);

    const auto divisor = RefreshRateSelector::getFrameRateDivisor(displayFps, frameRate);

    const auto now = TimePoint::now();

    const auto now = TimePoint::now();