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

Commit 4acdea69 authored by Rupesh Bansal's avatar Rupesh Bansal
Browse files

Remove idle screen refresh rate timeout flag 

Bug: 407931776
Test: Builds successfully
Flag: EXEMPT flag deletion
Change-Id: Ib04f7ac87ae0392e9fb9259486e926bfa5d88d30
parent 509f6297

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ void RefreshRateSelector::dump(utils::Dumper& dumper) const { 
}



std::chrono::milliseconds RefreshRateSelector::getIdleTimerTimeout() {

    if (FlagManager::getInstance().idle_screen_refresh_rate_timeout() && mIdleTimer) {

    if (mIdleTimer) {

        return std::chrono::duration_cast<std::chrono::milliseconds>(mIdleTimer->interval());

    }

    return mConfig.legacyIdleTimerTimeout;

services/surfaceflinger/SurfaceFlinger.cpp

+1 −5
Original line number Diff line number Diff line
@@ -8189,13 +8189,9 @@ status_t SurfaceFlinger::setDesiredDisplayModeSpecs(const sp<IBinder>& displayTo 
            return INVALID_OPERATION;

        } else {

            using Policy = scheduler::RefreshRateSelector::DisplayManagerPolicy;

            const auto idleScreenConfigOpt =

                    FlagManager::getInstance().idle_screen_refresh_rate_timeout()

                    ? specs.idleScreenRefreshRateConfig

                    : std::nullopt;

            const Policy policy{DisplayModeId(specs.defaultMode), translate(specs.primaryRanges),

                                translate(specs.appRequestRanges), specs.allowGroupSwitching,

                                idleScreenConfigOpt};

                                specs.idleScreenRefreshRateConfig};



            return setDesiredDisplayModeSpecsInternal(display, policy);

        }

services/surfaceflinger/common/FlagManager.cpp

+0 −4
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_ACONFIG_FLAG(graphite_renderengine);

    DUMP_ACONFIG_FLAG(hdcp_level_hal);

    DUMP_ACONFIG_FLAG(hdcp_negotiation);

    DUMP_ACONFIG_FLAG(idle_screen_refresh_rate_timeout);

    DUMP_ACONFIG_FLAG(latch_unsignaled_with_auto_refresh_changed);

    DUMP_ACONFIG_FLAG(local_tonemap_screenshots);

    DUMP_ACONFIG_FLAG(misc1);
@@ -316,9 +315,6 @@ FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(adpf_use_fmq_channel, "", android::os) 
FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(correct_virtual_display_power_state, "",

                                   android::companion::virtualdevice::flags)



/// Trunk stable readonly flags from outside SurfaceFlinger ///

FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(idle_screen_refresh_rate_timeout, "",

                                   com::android::server::display::feature::flags)

FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(adpf_use_fmq_channel_fixed, "", android::os)

FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(trace_frame_rate_override, "",

                                   com::android::graphics::libgui::flags);

services/surfaceflinger/common/include/common/FlagManager.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ public: 
    bool graphite_renderengine() const;

    bool hdcp_level_hal() const;

    bool hdcp_negotiation() const;

    bool idle_screen_refresh_rate_timeout() const;

    bool latch_unsignaled_with_auto_refresh_changed() const;

    bool local_tonemap_screenshots() const;

    bool luts_api() const;