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

Commit c9674336 authored by chaviw's avatar chaviw
Browse files

Traverse all layers to check if parent exists to add child layer. 

With the current implementation, when adding a child layer, the code
only looks in the layersSortedByZ vector to see if the parent exists.
The layersSortedByZ vector only contains the top most layers and not the
child layers. The current behavior prevents creating child layers that
have a parent that is also a child layer. This won't allow for nested child
layers. Instead, traverse the list of layers, which will include looking
at the child layers, to see if the parent layer exists.

Test: NestedChildren test in Transaction_test

Change-Id: I6c1a773b65e450010733f74f459fc327c7af3aea
parent e04a8005

services/surfaceflinger/SurfaceFlinger.cpp

+8 −1
Original line number Diff line number Diff line
@@ -2777,7 +2777,14 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
        if (parent == nullptr) {

            mCurrentState.layersSortedByZ.add(lbc);

        } else {

            if (mCurrentState.layersSortedByZ.indexOf(parent) < 0) {

            bool found = false;

            mCurrentState.traverseInZOrder([&](Layer* layer) {

                if (layer == parent.get()) {

                    found = true;

                }

            });



            if (!found) {

                ALOGE("addClientLayer called with a removed parent");

                return NAME_NOT_FOUND;

            }

services/surfaceflinger/tests/Transaction_test.cpp

+15 −0
Original line number Diff line number Diff line
@@ -1152,4 +1152,19 @@ TEST_F(ChildLayerTest, ReparentChild) { 
    }

}



TEST_F(ChildLayerTest, NestedChildren) {

    sp<SurfaceControl> grandchild = mComposerClient->createSurface(

        String8("Grandchild surface"),

        10, 10, PIXEL_FORMAT_RGBA_8888,

        0, mChild.get());

    fillSurfaceRGBA8(grandchild, 50, 50, 50);



    {

        ScreenCapture::captureScreen(&mCapture);

        // Expect the grandchild to begin at 64, 64 because it's a child of mChild layer

        // which begins at 64, 64

        mCapture->checkPixel(64, 64, 50, 50, 50);

    }

}



}