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

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

Merge "Add frame rate category change to AFFECTS_CHILDREN" into main

parents ad16bf27 43369b2b

libs/gui/include/gui/LayerState.h

+2 −2
Original line number Diff line number Diff line
@@ -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 |

services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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.