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

Commit 4da99064 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Remove PowerMode from RefreshRateStats" into main

parents 4b6f6059 de8d9a1d

services/surfaceflinger/Scheduler/RefreshRateStats.h

+2 −2
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ class RefreshRateStats { 


public:

    // TODO(b/185535769): Inject clock to avoid sleeping in tests.

    RefreshRateStats(TimeStats& timeStats, Fps currentRefreshRate, PowerMode currentPowerMode)

    RefreshRateStats(TimeStats& timeStats, Fps currentRefreshRate)

          : mTimeStats(timeStats),

            mCurrentRefreshRate(currentRefreshRate),

            mCurrentPowerMode(currentPowerMode) {}

            mCurrentPowerMode(PowerMode::OFF) {}



    void setPowerMode(PowerMode mode) {

        if (mCurrentPowerMode == mode) {

services/surfaceflinger/Scheduler/Scheduler.cpp

+1 −2
Original line number Diff line number Diff line
@@ -77,8 +77,7 @@ Scheduler::Scheduler(ICompositor& compositor, ISchedulerCallback& callback, Feat 
        mFeatures(features),

        mVsyncConfiguration(factory.createVsyncConfiguration(activeRefreshRate)),

        mVsyncModulator(sp<VsyncModulator>::make(mVsyncConfiguration->getCurrentConfigs())),

        mRefreshRateStats(std::make_unique<RefreshRateStats>(timeStats, activeRefreshRate,

                                                             hal::PowerMode::OFF)),

        mRefreshRateStats(std::make_unique<RefreshRateStats>(timeStats, activeRefreshRate)),

        mSchedulerCallback(callback),

        mVsyncTrackerCallback(vsyncTrackerCallback) {}

services/surfaceflinger/fuzzer/surfaceflinger_scheduler_fuzzer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -405,8 +405,8 @@ void SchedulerFuzzer::fuzzRefreshRateSelector() { 
                                             Fps::fromValue(mFdp.ConsumeFloatingPoint<float>()));



    android::mock::TimeStats timeStats;

    RefreshRateStats refreshRateStats(timeStats, Fps::fromValue(mFdp.ConsumeFloatingPoint<float>()),

                                      PowerMode::OFF);

    RefreshRateStats refreshRateStats(timeStats,

                                      Fps::fromValue(mFdp.ConsumeFloatingPoint<float>()));



    const auto fpsOpt = displayModes.get(modeId).transform(

            [](const DisplayModePtr& mode) { return mode->getVsyncRate(); });

services/surfaceflinger/tests/unittests/RefreshRateStatsTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ protected: 
    ~RefreshRateStatsTest();



    void resetStats(Fps fps) {

        mRefreshRateStats = std::make_unique<RefreshRateStats>(mTimeStats, fps, PowerMode::OFF);

        mRefreshRateStats = std::make_unique<RefreshRateStats>(mTimeStats, fps);

    }



    mock::TimeStats mTimeStats;