Skip to content

Commit fb429a0

Browse files
Sasha McIntoshAndroid (Google) Code Review
authored andcommitted
Merge "SF,HDR: Add readonly flag for connected display HDR feature" into main
2 parents a16da47 + 066288a commit fb429a0

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
@@ -156,6 +156,7 @@ void FlagManager::dump(std::string& result) const {
156156
DUMP_READ_ONLY_FLAG(trace_frame_rate_override);
157157
DUMP_READ_ONLY_FLAG(true_hdr_screenshots);
158158
DUMP_READ_ONLY_FLAG(display_config_error_hal);
159+
DUMP_READ_ONLY_FLAG(connected_display_hdr);
159160

160161
#undef DUMP_READ_ONLY_FLAG
161162
#undef DUMP_SERVER_FLAG
@@ -260,6 +261,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(flush_buffer_slots_to_uncache, "");
260261
FLAG_MANAGER_READ_ONLY_FLAG(force_compile_graphite_renderengine, "");
261262
FLAG_MANAGER_READ_ONLY_FLAG(true_hdr_screenshots, "debug.sf.true_hdr_screenshots");
262263
FLAG_MANAGER_READ_ONLY_FLAG(display_config_error_hal, "");
264+
FLAG_MANAGER_READ_ONLY_FLAG(connected_display_hdr, "");
263265

264266
/// Trunk stable server flags ///
265267
FLAG_MANAGER_SERVER_FLAG(refresh_rate_overlay_on_external_display, "")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class FlagManager {
9494
bool trace_frame_rate_override() const;
9595
bool true_hdr_screenshots() const;
9696
bool display_config_error_hal() const;
97+
bool connected_display_hdr() const;
9798

9899
protected:
99100
// overridden for unit tests

services/surfaceflinger/surfaceflinger_flags_new.aconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ flag {
5656
}
5757
} # commit_not_composited
5858

59+
flag {
60+
name: "connected_display_hdr"
61+
namespace: "core_graphics"
62+
description: "enable connected display hdr capability"
63+
bug: "374182788"
64+
is_fixed_read_only: true
65+
} # connected_display_hdr
66+
5967
flag {
6068
name: "correct_dpi_with_display_size"
6169
namespace: "core_graphics"

0 commit comments

Comments
 (0)