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

Commit 261614e0 authored by Ady Abraham's avatar Ady Abraham
Browse files

SurfaceFlinger: use isDisplayConfigAllowed in dumpVSync() 

Simplify the logic to dump the allowed display configs.

Test: adb shell dumpsys SurfaceFlinger
Change-Id: Id0c5f86779fc434f316c9da63e0118e2fc7de458
parent d7e5236a

services/surfaceflinger/SurfaceFlinger.cpp

+4 −6
Original line number Diff line number Diff line
@@ -1477,7 +1477,7 @@ void SurfaceFlinger::getCompositorTiming(CompositorTiming* compositorTiming) { 
    *compositorTiming = getBE().mCompositorTiming;

}



bool SurfaceFlinger::isDisplayConfigAllowed(int32_t configId) {

bool SurfaceFlinger::isDisplayConfigAllowed(int32_t configId) const {

    return mAllowedDisplayConfigs.empty() || mAllowedDisplayConfigs.count(configId);

}
@@ -4710,13 +4710,11 @@ void SurfaceFlinger::dumpVSync(std::string& result) const { 
    StringAppendF(&result, "+  Smart 90 for video detection: %s\n\n",

                  mUseSmart90ForVideo ? "on" : "off");

    StringAppendF(&result, "Allowed Display Configs: ");

    for (int32_t configId : mAllowedDisplayConfigs) {

    for (auto refresh : mRefreshRateConfigs.getRefreshRates()) {

            if (refresh.second && refresh.second->configId == configId) {

        if (refresh.second && isDisplayConfigAllowed(refresh.second->configId)) {

            StringAppendF(&result, "%dHz, ", refresh.second->fps);

        }

    }

    }

    StringAppendF(&result, "(config override by backdoor: %s)\n\n",

                  mDebugDisplayConfigSetByBackdoor ? "yes" : "no");

    mScheduler->dump(mAppConnectionHandle, result);

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ private: 
    // the desired refresh rate.

    void setRefreshRateTo(RefreshRateType, Scheduler::ConfigEvent event) REQUIRES(mStateLock);



    bool isDisplayConfigAllowed(int32_t configId) REQUIRES(mStateLock);

    bool isDisplayConfigAllowed(int32_t configId) const REQUIRES(mStateLock);



    /*

     * Display identification