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

Commit 0b51df88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Propagate tree on setting selection strategy" into main

parents 95f6bb96 d7479506

services/surfaceflinger/Layer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1352,6 +1352,8 @@ bool Layer::setFrameRateSelectionStrategy(FrameRateSelectionStrategy strategy) { 
    mDrawingState.frameRateSelectionStrategy = strategy;

    mDrawingState.sequence++;

    mDrawingState.modified = true;



    updateTreeHasFrameRateVote();

    setTransactionFlags(eTransactionNeeded);

    return true;

}

services/surfaceflinger/tests/unittests/FrameRateSelectionStrategyTest.cpp

+13 −0
Original line number Diff line number Diff line
@@ -153,6 +153,19 @@ TEST_P(FrameRateSelectionStrategyTest, SetParentAndGet) { 
    EXPECT_EQ(FRAME_RATE_VOTE1, layer3->getFrameRateForLayerTree());

    EXPECT_EQ(FrameRateSelectionStrategy::Self,

              layer3->getDrawingState().frameRateSelectionStrategy);



    layer1->setFrameRateSelectionStrategy(FrameRateSelectionStrategy::Self);

    commitTransaction();



    EXPECT_EQ(FRAME_RATE_VOTE1, layer1->getFrameRateForLayerTree());

    EXPECT_EQ(FrameRateSelectionStrategy::Self,

              layer1->getDrawingState().frameRateSelectionStrategy);

    EXPECT_EQ(FRAME_RATE_VOTE2, layer2->getFrameRateForLayerTree());

    EXPECT_EQ(FrameRateSelectionStrategy::OverrideChildren,

              layer2->getDrawingState().frameRateSelectionStrategy);

    EXPECT_EQ(FRAME_RATE_VOTE2, layer3->getFrameRateForLayerTree());

    EXPECT_EQ(FrameRateSelectionStrategy::Self,

              layer3->getDrawingState().frameRateSelectionStrategy);

}



} // namespace