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

Commit 5350e75c authored by Rachel Lee's avatar Rachel Lee Committed by Android (Google) Code Review
Browse files

Merge "Remove flag view_set_requested_frame_rate_mrr" into main

parents 9d3291a9 109c68e2

services/surfaceflinger/Scheduler/LayerInfo.cpp

+1 −2
Original line number Diff line number Diff line
@@ -595,8 +595,7 @@ bool LayerInfo::FrameRate::isVoteValidForMrr(bool isVrrDevice) const { 
        return true;

    }



    if (FlagManager::getInstance().view_set_requested_frame_rate_mrr() &&

        category == FrameRateCategory::NoPreference && vote.rate.isValid() &&

    if (category == FrameRateCategory::NoPreference && vote.rate.isValid() &&

        vote.type == FrameRateCompatibility::ExactOrMultiple) {

        return true;

    }

services/surfaceflinger/common/FlagManager.cpp

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

    DUMP_READ_ONLY_FLAG(enable_small_area_detection);

    DUMP_READ_ONLY_FLAG(frame_rate_category_mrr);

    DUMP_READ_ONLY_FLAG(view_set_requested_frame_rate_mrr);

    DUMP_READ_ONLY_FLAG(misc1);

    DUMP_READ_ONLY_FLAG(vrr_config);

    DUMP_READ_ONLY_FLAG(hotplug2);
@@ -224,8 +223,6 @@ FLAG_MANAGER_LEGACY_SERVER_FLAG(use_skia_tracing, PROPERTY_SKIA_ATRACE_ENABLED, 
FLAG_MANAGER_READ_ONLY_FLAG(connected_display, "")

FLAG_MANAGER_READ_ONLY_FLAG(enable_small_area_detection, "")

FLAG_MANAGER_READ_ONLY_FLAG(frame_rate_category_mrr, "debug.sf.frame_rate_category_mrr")

FLAG_MANAGER_READ_ONLY_FLAG(view_set_requested_frame_rate_mrr,

                            "debug.sf.view_set_requested_frame_rate_mrr")

FLAG_MANAGER_READ_ONLY_FLAG(misc1, "")

FLAG_MANAGER_READ_ONLY_FLAG(vrr_config, "debug.sf.enable_vrr_config")

FLAG_MANAGER_READ_ONLY_FLAG(hotplug2, "")

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

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ public: 
    /// Trunk stable readonly flags ///

    bool connected_display() const;

    bool frame_rate_category_mrr() const;

    bool view_set_requested_frame_rate_mrr() const;

    bool enable_small_area_detection() const;

    bool misc1() const;

    bool vrr_config() const;

services/surfaceflinger/tests/unittests/LayerHistoryIntegrationTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -894,7 +894,6 @@ TEST_F(LayerHistoryIntegrationTest, oneLayerExplicitCategory) { 


TEST_F(LayerHistoryIntegrationTest, oneLayerExplicitVoteWithFixedSourceAndNoPreferenceCategory) {

    SET_FLAG_FOR_TEST(flags::frame_rate_category_mrr, false);

    SET_FLAG_FOR_TEST(flags::view_set_requested_frame_rate_mrr, true);



    auto layer = createLegacyAndFrontedEndLayer(1);

    setFrameRate(1, (45.6_Hz).getValue(), ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,