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

Commit ac841858 authored by chaviw's avatar chaviw
Browse files

Add child layer to parent even if parent is removedFromCurrentState 

Test: Open ActivityViewTest and lock screen. App appears the same after
unlocking.
Fixes: 122962243

Change-Id: I1842084db83f77d017851dcd536e7f20ec81c18b
parent 7ab76b1c

services/surfaceflinger/SurfaceFlinger.cpp

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

        if (parent == nullptr && addToCurrentState) {

            mCurrentState.layersSortedByZ.add(lbc);

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

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

        } else if (parent == nullptr) {

            lbc->onRemovedFromCurrentState();

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

            parent->addChild(lbc);

            lbc->onRemovedFromCurrentState();

        } else {

            parent->addChild(lbc);