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

Commit 6597c540 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

Clean up dangling layer hierarchy references 

In order to support detached mirrors, we introduced a different path for
mirroring a hierarchy that excludes the root layer's transform. However,
when the mirrored layer was destroyed, references to this layer were not
properly removed from its mirroring hierarchy. Fix this and introduce a test
to cover this scenario.

Flag: EXEMPT bug fix
Fixes: 343901186
Test: presumbit

Change-Id: I32f41fc2c9db00590ede4509d75000ab0a38f116
parent b51f44c4

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