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

Commit fb429a02 authored by Sasha McIntosh's avatar Sasha McIntosh Committed by Android (Google) Code Review
Browse files

Merge "SF,HDR: Add readonly flag for connected display HDR feature" into main

parents a16da47f 066288aa

services/surfaceflinger/common/FlagManager.cpp

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_READ_ONLY_FLAG(trace_frame_rate_override);

    DUMP_READ_ONLY_FLAG(true_hdr_screenshots);

    DUMP_READ_ONLY_FLAG(display_config_error_hal);

    DUMP_READ_ONLY_FLAG(connected_display_hdr);



#undef DUMP_READ_ONLY_FLAG

#undef DUMP_SERVER_FLAG
@@ -260,6 +261,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(flush_buffer_slots_to_uncache, ""); 
FLAG_MANAGER_READ_ONLY_FLAG(force_compile_graphite_renderengine, "");

FLAG_MANAGER_READ_ONLY_FLAG(true_hdr_screenshots, "debug.sf.true_hdr_screenshots");

FLAG_MANAGER_READ_ONLY_FLAG(display_config_error_hal, "");

FLAG_MANAGER_READ_ONLY_FLAG(connected_display_hdr, "");



/// Trunk stable server flags ///

FLAG_MANAGER_SERVER_FLAG(refresh_rate_overlay_on_external_display, "")

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

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

    bool true_hdr_screenshots() const;

    bool display_config_error_hal() const;

    bool connected_display_hdr() const;



protected:

    // overridden for unit tests

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -56,6 +56,14 @@ flag { 
  }

} # commit_not_composited



flag {

  name: "connected_display_hdr"

  namespace: "core_graphics"

  description: "enable connected display hdr capability"

  bug: "374182788"

  is_fixed_read_only: true

} # connected_display_hdr



flag {

  name: "correct_dpi_with_display_size"

  namespace: "core_graphics"