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

Commit 1c2ccb62 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3281666, 3281667, 3281686] into pi-release 

Change-Id: Iaef6b4a1081a80fd3443daeeea4f2f0c331e90b6
parents 2e5c86b3 ff3d20e1

services/surfaceflinger/SurfaceFlinger.cpp

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

            mCurrentState.layersSortedByZ.add(lbc);

        } else {

            bool found = false;

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

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

                    found = true;

                }

            });



            if (!found) {

            if (parent->isPendingRemoval()) {

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

                return NAME_NOT_FOUND;

            }