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

Commit 19e886cd authored by Xiang Wang's avatar Xiang Wang Committed by Android (Google) Code Review
Browse files

Merge "Add ADPF GPU impl flag for SurfaceFlinger" into main

parents be3b53b4 05cb7647

services/surfaceflinger/common/FlagManager.cpp

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


    /// Trunk stable server flags ///

    DUMP_SERVER_FLAG(refresh_rate_overlay_on_external_display);

    DUMP_SERVER_FLAG(adpf_gpu_sf);

    DUMP_SERVER_FLAG(adpf_use_fmq_channel);



    /// Trunk stable readonly flags ///
@@ -220,6 +221,7 @@ FLAG_MANAGER_READ_ONLY_FLAG(protected_if_client, "") 


/// Trunk stable server flags ///

FLAG_MANAGER_SERVER_FLAG(refresh_rate_overlay_on_external_display, "")

FLAG_MANAGER_SERVER_FLAG(adpf_gpu_sf, "")



/// Trunk stable server flags from outside SurfaceFlinger ///

FLAG_MANAGER_SERVER_FLAG_IMPORTED(adpf_use_fmq_channel, "", android::os)

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

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ public: 


    /// Trunk stable server flags ///

    bool refresh_rate_overlay_on_external_display() const;

    bool adpf_gpu_sf() const;

    bool adpf_use_fmq_channel() const;



    /// Trunk stable readonly flags ///

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,13 @@ 
package: "com.android.graphics.surfaceflinger.flags"

container: "system"



flag {

    name: "adpf_gpu_sf"

    namespace: "game"

    description: "Guards use of the sending ADPF GPU duration hint and load hints from SurfaceFlinger to Power HAL"

    bug: "284324521"

} # adpf_gpu_sf



flag {

  name: "dont_skip_on_early_ro2"

  namespace: "core_graphics"

services/surfaceflinger/tests/unittests/FlagManagerTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ TEST_F(FlagManagerTest, legacyReturnsValue) { 
    EXPECT_EQ(false, mFlagManager.test_flag());

}



TEST_F(FlagManagerTest, creashesIfQueriedBeforeBoot) {

TEST_F(FlagManagerTest, crashesIfQueriedBeforeBoot) {

    mFlagManager.markBootIncomplete();

    EXPECT_DEATH(FlagManager::getInstance()

        .refresh_rate_overlay_on_external_display(), "");