diff options
| author | Ady Abraham <adyabr@google.com> | 2020-07-09 18:16:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-09 18:16:05 +0000 |
| commit | 747819d612d6d9ee6620baf932111d44199e2aa1 (patch) | |
| tree | 42c71d1d25d23f5bb3d0b9c65a3ec53ed05f4283 | |
| parent | 9b2526e50d375d60e5a6a43992649d9bb25c176a (diff) | |
| parent | 20c029ce8217c2fd0e94ecebb985ed38324328bb (diff) | |
| download | native-747819d612d6d9ee6620baf932111d44199e2aa1.tar.gz | |
Merge "SurfaceFlinger: only ExplicitDefault can use appRequestRange" into rvc-dev
| -rw-r--r-- | services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp | 6 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp | 22 |
2 files changed, 5 insertions, 23 deletions
diff --git a/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp b/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp index 053d0a7a39..8661b6ee0a 100644 --- a/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp +++ b/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp @@ -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; } diff --git a/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp b/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp index 03d4460b15..1f6f166b45 100644 --- a/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp +++ b/services/surfaceflinger/tests/unittests/RefreshRateConfigsTest.cpp @@ -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( |