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

Commit 256adf73 authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Avoid adding to root when parent is destroyed"

parents 220e6b53 d712ad3e

services/surfaceflinger/SurfaceFlinger.cpp

+3 −1
Original line number Diff line number Diff line
@@ -6825,14 +6825,16 @@ sp<Layer> SurfaceFlinger::handleLayerCreatedLocked(const sp<IBinder>& handle) { 
    }



    sp<Layer> parent;

    bool addToRoot = state->addToRoot;

    if (state->initialParent != nullptr) {

        parent = state->initialParent.promote();

        if (parent == nullptr) {

            ALOGE("Invalid parent %p", state->initialParent.unsafe_get());

            addToRoot = false;

        }

    }



    if (parent == nullptr && state->addToRoot) {

    if (parent == nullptr && addToRoot) {

        layer->setIsAtRoot(true);

        mCurrentState.layersSortedByZ.add(layer);

    } else if (parent == nullptr) {