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

Commit 13d33e3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Add a readonly feature flag for display config error HAL changes" into main

parents d83ace11 6ab69ae5

services/surfaceflinger/common/FlagManager.cpp

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

    DUMP_READ_ONLY_FLAG(single_hop_screenshot);

    DUMP_READ_ONLY_FLAG(trace_frame_rate_override);

    DUMP_READ_ONLY_FLAG(trace_frame_rate_override);

    DUMP_READ_ONLY_FLAG(true_hdr_screenshots);

    DUMP_READ_ONLY_FLAG(true_hdr_screenshots);

    DUMP_READ_ONLY_FLAG(display_config_error_hal);





#undef DUMP_READ_ONLY_FLAG

#undef DUMP_READ_ONLY_FLAG

#undef DUMP_SERVER_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(force_compile_graphite_renderengine, "");

FLAG_MANAGER_READ_ONLY_FLAG(single_hop_screenshot, "");

FLAG_MANAGER_READ_ONLY_FLAG(single_hop_screenshot, "");

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

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

FLAG_MANAGER_READ_ONLY_FLAG(display_config_error_hal, "");





/// Trunk stable server flags ///

/// Trunk stable server flags ///

FLAG_MANAGER_SERVER_FLAG(refresh_rate_overlay_on_external_display, "")

FLAG_MANAGER_SERVER_FLAG(refresh_rate_overlay_on_external_display, "")

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

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

    bool single_hop_screenshot() const;

    bool trace_frame_rate_override() const;

    bool trace_frame_rate_override() const;

    bool true_hdr_screenshots() const;

    bool true_hdr_screenshots() const;

    bool display_config_error_hal() const;





protected:

protected:

    // overridden for unit tests

    // overridden for unit tests

services/surfaceflinger/surfaceflinger_flags_new.aconfig

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

  }

} # detached_mirror

} # detached_mirror





flag {

  name: "display_config_error_hal"

  namespace: "core_graphics"

  description: "Report HAL display configuration errors like modeset failure or link training failure"

  bug: "374184110"

  is_fixed_read_only: true

} # display_config_error_hal



flag {

flag {

  name: "filter_frames_before_trace_starts"

  name: "filter_frames_before_trace_starts"

  namespace: "core_graphics"

  namespace: "core_graphics"