Skip to content

Commit 4acdea6

Browse files
author
Rupesh Bansal
committed
Remove idle screen refresh rate timeout flag
Bug: 407931776 Test: Builds successfully Flag: EXEMPT flag deletion Change-Id: Ib04f7ac87ae0392e9fb9259486e926bfa5d88d30
1 parent 509f629 commit 4acdea6

4 files changed

Lines changed: 2 additions & 11 deletions

File tree

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,7 @@ void RefreshRateSelector::dump(utils::Dumper& dumper) const {
16741674
}
16751675

16761676
std::chrono::milliseconds RefreshRateSelector::getIdleTimerTimeout() {
1677-
if (FlagManager::getInstance().idle_screen_refresh_rate_timeout() && mIdleTimer) {
1677+
if (mIdleTimer) {
16781678
return std::chrono::duration_cast<std::chrono::milliseconds>(mIdleTimer->interval());
16791679
}
16801680
return mConfig.legacyIdleTimerTimeout;

services/surfaceflinger/SurfaceFlinger.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8189,13 +8189,9 @@ status_t SurfaceFlinger::setDesiredDisplayModeSpecs(const sp<IBinder>& displayTo
81898189
return INVALID_OPERATION;
81908190
} else {
81918191
using Policy = scheduler::RefreshRateSelector::DisplayManagerPolicy;
8192-
const auto idleScreenConfigOpt =
8193-
FlagManager::getInstance().idle_screen_refresh_rate_timeout()
8194-
? specs.idleScreenRefreshRateConfig
8195-
: std::nullopt;
81968192
const Policy policy{DisplayModeId(specs.defaultMode), translate(specs.primaryRanges),
81978193
translate(specs.appRequestRanges), specs.allowGroupSwitching,
8198-
idleScreenConfigOpt};
8194+
specs.idleScreenRefreshRateConfig};
81998195

82008196
return setDesiredDisplayModeSpecsInternal(display, policy);
82018197
}

services/surfaceflinger/common/FlagManager.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ void FlagManager::dump(std::string& result) const {
163163
DUMP_ACONFIG_FLAG(graphite_renderengine);
164164
DUMP_ACONFIG_FLAG(hdcp_level_hal);
165165
DUMP_ACONFIG_FLAG(hdcp_negotiation);
166-
DUMP_ACONFIG_FLAG(idle_screen_refresh_rate_timeout);
167166
DUMP_ACONFIG_FLAG(latch_unsignaled_with_auto_refresh_changed);
168167
DUMP_ACONFIG_FLAG(local_tonemap_screenshots);
169168
DUMP_ACONFIG_FLAG(misc1);
@@ -316,9 +315,6 @@ FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(adpf_use_fmq_channel, "", android::os)
316315
FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(correct_virtual_display_power_state, "",
317316
android::companion::virtualdevice::flags)
318317

319-
/// Trunk stable readonly flags from outside SurfaceFlinger ///
320-
FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(idle_screen_refresh_rate_timeout, "",
321-
com::android::server::display::feature::flags)
322318
FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(adpf_use_fmq_channel_fixed, "", android::os)
323319
FLAG_MANAGER_ACONFIG_FLAG_IMPORTED(trace_frame_rate_override, "",
324320
com::android::graphics::libgui::flags);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ class FlagManager {
9797
bool graphite_renderengine() const;
9898
bool hdcp_level_hal() const;
9999
bool hdcp_negotiation() const;
100-
bool idle_screen_refresh_rate_timeout() const;
101100
bool latch_unsignaled_with_auto_refresh_changed() const;
102101
bool local_tonemap_screenshots() const;
103102
bool luts_api() const;

0 commit comments

Comments
 (0)