diff options
| author | 2023-09-07 17:40:24 +0000 | |
|---|---|---|
| committer | 2023-09-07 17:40:24 +0000 | |
| commit | 2376cc97ff83be14cafb857dd2bd1c6206dfb8fd (patch) | |
| tree | 0e1b53bd3be0b168a87045fef816a703d7a2b5a6 | |
| parent | ad16bf27ab695919347965d917de3c1c7ed5cb0f (diff) | |
| parent | 43369b2b2a3700b1754600aa0a0a27d78660b42d (diff) | |
Merge "Add frame rate category change to AFFECTS_CHILDREN" into main
| -rw-r--r-- | libs/gui/include/gui/LayerState.h | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/gui/include/gui/LayerState.h b/libs/gui/include/gui/LayerState.h index 2cf51237fd..8c360589f0 100644 --- a/libs/gui/include/gui/LayerState.h +++ b/libs/gui/include/gui/LayerState.h @@ -267,8 +267,8 @@ struct layer_state_t { layer_state_t::eBackgroundBlurRadiusChanged | layer_state_t::eBlurRegionsChanged | layer_state_t::eColorTransformChanged | layer_state_t::eCornerRadiusChanged | layer_state_t::eFlagsChanged | layer_state_t::eTrustedOverlayChanged | - layer_state_t::eFrameRateChanged | layer_state_t::eFrameRateSelectionPriority | - layer_state_t::eFixedTransformHintChanged; + layer_state_t::eFrameRateChanged | layer_state_t::eFrameRateCategoryChanged | + layer_state_t::eFrameRateSelectionPriority | layer_state_t::eFixedTransformHintChanged; // Changes affecting data sent to input. static constexpr uint64_t INPUT_CHANGES = layer_state_t::eInputInfoChanged | diff --git a/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp b/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp index 72ed4c801e..23534802cc 100644 --- a/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp +++ b/services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp @@ -667,6 +667,8 @@ TEST_F(LayerSnapshotTest, frameRateWithCategory) { scheduler::LayerInfo::FrameRateCompatibility::Default); EXPECT_EQ(getSnapshot({.id = 122})->frameRate.category, FrameRateCategory::Normal); EXPECT_TRUE(getSnapshot({.id = 122})->changes.test(RequestedLayerState::Changes::FrameRate)); + EXPECT_TRUE( + getSnapshot({.id = 122})->changes.test(RequestedLayerState::Changes::AffectsChildren)); EXPECT_FALSE(getSnapshot({.id = 1221})->frameRate.vote.rate.isValid()); EXPECT_TRUE(getSnapshot({.id = 1221})->frameRate.isValid()); @@ -674,6 +676,8 @@ TEST_F(LayerSnapshotTest, frameRateWithCategory) { scheduler::LayerInfo::FrameRateCompatibility::Default); EXPECT_EQ(getSnapshot({.id = 1221})->frameRate.category, FrameRateCategory::Normal); EXPECT_TRUE(getSnapshot({.id = 1221})->changes.test(RequestedLayerState::Changes::FrameRate)); + EXPECT_TRUE( + getSnapshot({.id = 1221})->changes.test(RequestedLayerState::Changes::AffectsChildren)); // reparent and verify the child does NOT get the new parent's framerate because it already has // the frame rate category specified. |