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

Commit a95ed976 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: Update RefreshRateOverlay before SF applies transactions" into sc-dev

parents 6c9d4040 1047e5ef

services/surfaceflinger/SurfaceFlinger.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -1189,6 +1189,10 @@ void SurfaceFlinger::setActiveModeInternal() { 
    updatePhaseConfiguration(refreshRate);

    updatePhaseConfiguration(refreshRate);

    ATRACE_INT("ActiveConfigFPS", refreshRate.getValue());

    ATRACE_INT("ActiveConfigFPS", refreshRate.getValue());





    if (mRefreshRateOverlay) {

        mRefreshRateOverlay->changeRefreshRate(upcomingMode->getFps());

    }



    if (mUpcomingActiveMode.event != Scheduler::ModeEvent::None) {

    if (mUpcomingActiveMode.event != Scheduler::ModeEvent::None) {

        const nsecs_t vsyncPeriod = refreshRate.getPeriodNsecs();

        const nsecs_t vsyncPeriod = refreshRate.getPeriodNsecs();

        const auto physicalId = display->getPhysicalId();

        const auto physicalId = display->getPhysicalId();
@@ -1271,9 +1275,6 @@ void SurfaceFlinger::performSetActiveMode() { 
    }

    }





    mScheduler->onNewVsyncPeriodChangeTimeline(outTimeline);

    mScheduler->onNewVsyncPeriodChangeTimeline(outTimeline);

    if (mRefreshRateOverlay) {

        mRefreshRateOverlay->changeRefreshRate(desiredMode->getFps());

    }





    // Scheduler will submit an empty frame to HWC if needed.

    // Scheduler will submit an empty frame to HWC if needed.

    mSetActiveModePending = true;

    mSetActiveModePending = true;