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

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

Merge "SurfaceFlinger: set the refresh rate on overlay when calling to hwc"... 

Merge "SurfaceFlinger: set the refresh rate on overlay when calling to hwc" into sc-dev am: 64812298

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

Change-Id: I39b3a746a43ec8ddcdd73eb0085d0786936c255d
parents ceb70041 64812298

services/surfaceflinger/SurfaceFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1029,10 +1029,6 @@ void SurfaceFlinger::setDesiredActiveMode(const ActiveModeInfo& info) { 
        updatePhaseConfiguration(refreshRate.getFps());

        mScheduler->setModeChangePending(true);

    }



    if (mRefreshRateOverlay) {

        mRefreshRateOverlay->changeRefreshRate(refreshRate.getFps());

    }

}



status_t SurfaceFlinger::setActiveMode(const sp<IBinder>& displayToken, int modeId) {
@@ -1190,6 +1186,10 @@ void SurfaceFlinger::performSetActiveMode() { 
    }



    mScheduler->onNewVsyncPeriodChangeTimeline(outTimeline);

    if (mRefreshRateOverlay) {

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

    }



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

    mSetActiveModePending = true;

}