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

Commit d0f108eb authored by Alec Mouri's avatar Alec Mouri
Browse files

Fix flattenLayers_ActiveLayersWithLowFpsAreFlattened 

This test crashes on some devices, due to incorrect set up order in the
test. Specifically, the incoming layers were configured as inactive too
early, meaning that setting up the flattener state triggered
RenderEngine expectations that were not yet mocked, which results in
UB.

Bug: 307776985
Test: libcompositionengine_test
Change-Id: I75096c0d043f02f5837a83d0f48053e3cd151691
parent f4d5f265

services/surfaceflinger/CompositionEngine/tests/planner/FlattenerTest.cpp

+4 −3
Original line number Diff line number Diff line
@@ -223,9 +223,6 @@ TEST_F(FlattenerTest, flattenLayers_ActiveLayersAreNotFlattened) { 
}



TEST_F(FlattenerTest, flattenLayers_ActiveLayersWithLowFpsAreFlattened) {

    mTestLayers[0]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold / 2;

    mTestLayers[1]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold;



    auto& layerState1 = mTestLayers[0]->layerState;

    auto& layerState2 = mTestLayers[1]->layerState;
@@ -235,6 +232,10 @@ TEST_F(FlattenerTest, flattenLayers_ActiveLayersWithLowFpsAreFlattened) { 
    };



    initializeFlattener(layers);



    mTestLayers[0]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold / 2;

    mTestLayers[1]->layerFECompositionState.fps = Flattener::kFpsActiveThreshold;



    expectAllLayersFlattened(layers);

}