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

Commit 517839c4 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Clean up dangling layer hierarchy references" into main

parents 593e00f3 6597c540

services/surfaceflinger/FrontEnd/LayerLifecycleManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ void LayerLifecycleManager::onHandlesDestroyed( 
            if (swapErase(linkedLayer->mirrorIds, layer.id)) {

                linkedLayer->changes |= RequestedLayerState::Changes::Mirror;

            }

            if (linkedLayer->layerIdToMirror == layer.id) {

                linkedLayer->layerIdToMirror = UNASSIGNED_LAYER_ID;

                linkedLayer->changes |= RequestedLayerState::Changes::Mirror;

            }

            if (linkedLayer->touchCropId == layer.id) {

                linkedLayer->touchCropId = UNASSIGNED_LAYER_ID;

            }

services/surfaceflinger/tests/unittests/LayerHierarchyTest.cpp

+24 −0
Original line number Diff line number Diff line
@@ -777,4 +777,28 @@ TEST_F(LayerHierarchyTest, canMirrorDisplayWithMirrors) { 
    EXPECT_EQ(getTraversalPath(hierarchyBuilder.getOffscreenHierarchy()), expected);

}



// (b/343901186)

TEST_F(LayerHierarchyTest, cleanUpDanglingMirrorLayer) {

    LayerHierarchyBuilder hierarchyBuilder;

    hierarchyBuilder.update(mLifecycleManager);

    mirrorLayer(/*layer*/ 14, /*parent*/ 1, /*layerToMirror*/ 2);

    UPDATE_AND_VERIFY(hierarchyBuilder);



    std::vector<uint32_t> expectedTraversalPath = {1, 11, 111, 12, 121, 122, 1221, 13, 14, 2, 2};

    EXPECT_EQ(getTraversalPath(hierarchyBuilder.getHierarchy()), expectedTraversalPath);

    EXPECT_EQ(getTraversalPathInZOrder(hierarchyBuilder.getHierarchy()), expectedTraversalPath);

    expectedTraversalPath = {};

    EXPECT_EQ(getTraversalPath(hierarchyBuilder.getOffscreenHierarchy()), expectedTraversalPath);



    // destroy layer handle

    reparentLayer(2, UNASSIGNED_LAYER_ID);

    destroyLayerHandle(2);

    UPDATE_AND_VERIFY(hierarchyBuilder);

    expectedTraversalPath = {1, 11, 111, 12, 121, 122, 1221, 13, 14};

    EXPECT_EQ(getTraversalPath(hierarchyBuilder.getHierarchy()), expectedTraversalPath);

    EXPECT_EQ(getTraversalPathInZOrder(hierarchyBuilder.getHierarchy()), expectedTraversalPath);

    expectedTraversalPath = {};

    EXPECT_EQ(getTraversalPath(hierarchyBuilder.getOffscreenHierarchy()), expectedTraversalPath);

}



} // namespace android::surfaceflinger::frontend