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

Commit b4049970 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add child layer to parent even if parent is removedFromCurrentState"

parents a3ff1db1 ac841858

services/surfaceflinger/SurfaceFlinger.cpp

+5 −3
Original line number Original line Diff line number Diff line
@@ -3456,8 +3456,10 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
        }

        }

        if (parent == nullptr && addToCurrentState) {

        if (parent == nullptr && addToCurrentState) {

            mCurrentState.layersSortedByZ.add(lbc);

            mCurrentState.layersSortedByZ.add(lbc);

        } else if (parent == nullptr || parent->isRemovedFromCurrentState()) {

        } else if (parent == nullptr) {

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

            lbc->onRemovedFromCurrentState();

        } else if (parent->isRemovedFromCurrentState()) {

            parent->addChild(lbc);

            lbc->onRemovedFromCurrentState();

            lbc->onRemovedFromCurrentState();

        } else {

        } else {

            parent->addChild(lbc);

            parent->addChild(lbc);