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

Commit 2959e531 authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

Merge "SurfaceFlinger: only ExplicitDefault can use appRequestRange" into... 

Merge "SurfaceFlinger: only ExplicitDefault can use appRequestRange" into rvc-dev am: 747819d6 am: 67656958 am: 536e09c1 am: ccd5e5dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12089386

Change-Id: I57a7bb6ff08a3ea69932625c82b5201ca652c129
parents 56141bf9 ccd5e5dc

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

+2 −4
Original line number Diff line number Diff line
@@ -212,10 +212,8 @@ const RefreshRate& RefreshRateConfigs::getBestRefreshRate( 
            bool inPrimaryRange =

                    scores[i].first->inPolicy(policy->primaryRange.min, policy->primaryRange.max);

            if ((primaryRangeIsSingleRate || !inPrimaryRange) &&

                !(layer.focused &&

                  (layer.vote == LayerVoteType::ExplicitDefault ||

                   layer.vote == LayerVoteType::ExplicitExactOrMultiple))) {

                // Only focused layers with explicit frame rate settings are allowed to score

                !(layer.focused && layer.vote == LayerVoteType::ExplicitDefault)) {

                // Only focused layers with ExplicitDefault frame rate settings are allowed to score

                // refresh rates outside the primary range.

                continue;

            }

services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp

+3 −19
Original line number Diff line number Diff line
@@ -1130,15 +1130,6 @@ TEST_F(RefreshRateConfigsTest, 
    auto& lr = layers[0];



    RefreshRateConfigs::GlobalSignals consideredSignals;

    lr.vote = LayerVoteType::ExplicitExactOrMultiple;

    lr.desiredRefreshRate = 60.0f;

    lr.name = "60Hz ExplicitExactOrMultiple";

    lr.focused = true;

    EXPECT_EQ(mExpected60Config,

              refreshRateConfigs->getBestRefreshRate(layers, {.touch = true, .idle = true},

                                                     &consideredSignals));

    EXPECT_EQ(false, consideredSignals.touch);



    lr.vote = LayerVoteType::ExplicitDefault;

    lr.desiredRefreshRate = 60.0f;

    lr.name = "60Hz ExplicitDefault";
@@ -1162,13 +1153,6 @@ TEST_F(RefreshRateConfigsTest, 
    auto layers = std::vector<LayerRequirement>{LayerRequirement{.weight = 1.0f}};

    auto& lr = layers[0];



    lr.vote = LayerVoteType::ExplicitExactOrMultiple;

    lr.desiredRefreshRate = 90.0f;

    lr.name = "90Hz ExplicitExactOrMultiple";

    lr.focused = true;

    EXPECT_EQ(mExpected90Config,

              refreshRateConfigs->getBestRefreshRate(layers, {.touch = false, .idle = true}));



    lr.vote = LayerVoteType::ExplicitDefault;

    lr.desiredRefreshRate = 90.0f;

    lr.name = "90Hz ExplicitDefault";
@@ -1204,7 +1188,7 @@ TEST_F(RefreshRateConfigsTest, 
              refreshRateConfigs->getBestRefreshRate(layers, {.touch = false, .idle = false}));



    lr.focused = true;

    EXPECT_EQ(mExpected60Config,

    EXPECT_EQ(mExpected90Config,

              refreshRateConfigs->getBestRefreshRate(layers, {.touch = false, .idle = false}));



    lr.vote = LayerVoteType::ExplicitDefault;
@@ -1306,7 +1290,7 @@ TEST_F(RefreshRateConfigsTest, primaryVsAppRequestPolicy) { 
    EXPECT_EQ(HWC_CONFIG_ID_60, getFrameRate(LayerVoteType::Max, 90.f));

    EXPECT_EQ(HWC_CONFIG_ID_60, getFrameRate(LayerVoteType::Heuristic, 90.f));

    EXPECT_EQ(HWC_CONFIG_ID_90, getFrameRate(LayerVoteType::ExplicitDefault, 90.f));

    EXPECT_EQ(HWC_CONFIG_ID_90, getFrameRate(LayerVoteType::ExplicitExactOrMultiple, 90.f));

    EXPECT_EQ(HWC_CONFIG_ID_60, getFrameRate(LayerVoteType::ExplicitExactOrMultiple, 90.f));



    // Layers not focused are not allowed to override primary config

    EXPECT_EQ(HWC_CONFIG_ID_60,
@@ -1321,7 +1305,7 @@ TEST_F(RefreshRateConfigsTest, primaryVsAppRequestPolicy) { 
    // When we're higher than the primary range max due to a layer frame rate setting, touch boost

    // shouldn't drag us back down to the primary range max.

    EXPECT_EQ(HWC_CONFIG_ID_90, getFrameRate(LayerVoteType::ExplicitDefault, 90.f, /*touch=*/true));

    EXPECT_EQ(HWC_CONFIG_ID_90,

    EXPECT_EQ(HWC_CONFIG_ID_60,

              getFrameRate(LayerVoteType::ExplicitExactOrMultiple, 90.f, /*touch=*/true));



    ASSERT_GE(refreshRateConfigs->setDisplayManagerPolicy(