Skip to content

Commit 4c575a1

Browse files
committed
Flag: Add a trunk-stable flag to guard EDID-based Display IDs
Add a trunk-stable flag to guard the use of EDID-based display IDs. See: go/edid-display-ids-al13 Flag: com.android.graphics.surfaceflinger.flags.stable_edid_ids Bug: 352320847 Test: None. Change-Id: Ifc59d031faeb19aedf5eccc68a1c9a5d0f538122
1 parent a60def9 commit 4c575a1

3 files changed

Lines changed: 11 additions & 0 deletions

File tree

services/surfaceflinger/common/FlagManager.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ void FlagManager::dump(std::string& result) const {
119119
DUMP_READ_ONLY_FLAG(adpf_fmq_sf);
120120
DUMP_READ_ONLY_FLAG(connected_display);
121121
DUMP_READ_ONLY_FLAG(enable_small_area_detection);
122+
DUMP_READ_ONLY_FLAG(stable_edid_ids);
122123
DUMP_READ_ONLY_FLAG(frame_rate_category_mrr);
123124
DUMP_READ_ONLY_FLAG(misc1);
124125
DUMP_READ_ONLY_FLAG(vrr_config);
@@ -228,6 +229,7 @@ FLAG_MANAGER_LEGACY_SERVER_FLAG(use_skia_tracing, PROPERTY_SKIA_ATRACE_ENABLED,
228229
FLAG_MANAGER_READ_ONLY_FLAG(adpf_fmq_sf, "")
229230
FLAG_MANAGER_READ_ONLY_FLAG(connected_display, "")
230231
FLAG_MANAGER_READ_ONLY_FLAG(enable_small_area_detection, "")
232+
FLAG_MANAGER_READ_ONLY_FLAG(stable_edid_ids, "debug.sf.stable_edid_ids")
231233
FLAG_MANAGER_READ_ONLY_FLAG(frame_rate_category_mrr, "debug.sf.frame_rate_category_mrr")
232234
FLAG_MANAGER_READ_ONLY_FLAG(misc1, "")
233235
FLAG_MANAGER_READ_ONLY_FLAG(vrr_config, "debug.sf.enable_vrr_config")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class FlagManager {
5858
bool connected_display() const;
5959
bool frame_rate_category_mrr() const;
6060
bool enable_small_area_detection() const;
61+
bool stable_edid_ids() const;
6162
bool misc1() const;
6263
bool vrr_config() const;
6364
bool hotplug2() const;

services/surfaceflinger/surfaceflinger_flags_new.aconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,14 @@ flag {
206206
}
207207
} # skip_invisible_windows_in_input
208208

209+
flag {
210+
name: "stable_edid_ids"
211+
namespace: "core_graphics"
212+
description: "Guard use of the new stable EDID-based display IDs system."
213+
bug: "352320847"
214+
is_fixed_read_only: true
215+
} # stable_edid_ids
216+
209217
flag {
210218
name: "true_hdr_screenshots"
211219
namespace: "core_graphics"

0 commit comments

Comments
 (0)