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

Commit a65e1325 authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Add flag for enabling local tonemapping screenshots" into main

parents da9ba7b2 1818c186

services/surfaceflinger/common/FlagManager.cpp

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

    DUMP_READ_ONLY_FLAG(detached_mirror);

    DUMP_READ_ONLY_FLAG(commit_not_composited);

    DUMP_READ_ONLY_FLAG(local_tonemap_screenshots);



#undef DUMP_READ_ONLY_FLAG

#undef DUMP_SERVER_FLAG
@@ -240,6 +241,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(deprecate_vsync_sf, ""); 
FLAG_MANAGER_READ_ONLY_FLAG(allow_n_vsyncs_in_targeter, "");

FLAG_MANAGER_READ_ONLY_FLAG(detached_mirror, "");

FLAG_MANAGER_READ_ONLY_FLAG(commit_not_composited, "");

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



/// 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
@@ -84,6 +84,7 @@ public: 
    bool allow_n_vsyncs_in_targeter() const;

    bool detached_mirror() const;

    bool commit_not_composited() const;

    bool local_tonemap_screenshots() const;



protected:

    // overridden for unit tests

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -76,4 +76,12 @@ flag { 
  }

} # latch_unsignaled_with_auto_refresh_changed



flag {

    name: "local_tonemap_screenshots"

    namespace: "core_graphics"

    description: "Enables local tonemapping when capturing screenshots"

    bug: "329464641"

    is_fixed_read_only: true

} # local_tonemap_screenshots



# IMPORTANT - please keep alphabetize to reduce merge conflicts