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

Commit 345e0b76 authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "SF: Update RefreshRateOverlay before SF applies transactions" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15161679

Change-Id: I5aea23192c6622db3f7d326876a6539880e9ce55
parents 181618f6 b631837d

services/surfaceflinger/SurfaceFlinger.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -1190,6 +1190,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();
@@ -1272,9 +1276,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;