SF: use CategoryDefault for layers w/ setFrameRate
Uses Default category for layers with that also specified something in
setFrameRate. this makes it easier downstream to not double count or
choose frame rate incorrectly.
Bug: 325130604
Test: atest libsurfaceflinger_unittest
Change-Id: I6481c6fd95474310e11046839f8b05e136bf3f19
diff --git a/services/surfaceflinger/tests/unittests/LayerInfoTest.cpp b/services/surfaceflinger/tests/unittests/LayerInfoTest.cpp
index 9fe9ee8..c1fa6ac 100644
--- a/services/surfaceflinger/tests/unittests/LayerInfoTest.cpp
+++ b/services/surfaceflinger/tests/unittests/LayerInfoTest.cpp
@@ -213,7 +213,8 @@
TEST_F(LayerInfoTest, getRefreshRateVote_explicitVoteWithCategory) {
LayerInfo::LayerVote vote = {.type = LayerHistory::LayerVoteType::ExplicitDefault,
.fps = 20_Hz,
- .category = FrameRateCategory::High};
+ .category = FrameRateCategory::High,
+ .categorySmoothSwitchOnly = true};
layerInfo.setLayerVote(vote);
auto actualVotes =
@@ -221,10 +222,12 @@
ASSERT_EQ(actualVotes.size(), 2u);
ASSERT_EQ(actualVotes[0].type, LayerHistory::LayerVoteType::ExplicitCategory);
ASSERT_EQ(actualVotes[0].category, vote.category);
+ ASSERT_TRUE(actualVotes[0].categorySmoothSwitchOnly);
ASSERT_EQ(actualVotes[1].type, vote.type);
ASSERT_EQ(actualVotes[1].fps, vote.fps);
ASSERT_EQ(actualVotes[1].seamlessness, vote.seamlessness);
- ASSERT_EQ(actualVotes[1].category, vote.category);
+ ASSERT_EQ(actualVotes[1].category, FrameRateCategory::Default);
+ ASSERT_TRUE(actualVotes[1].categorySmoothSwitchOnly);
}
TEST_F(LayerInfoTest, getRefreshRateVote_explicitCategory) {