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

Commit 8d2711bb authored by Robert Carr's avatar Robert Carr
Browse files

SurfaceFlinger: Remove dead "topLevelOnly" code. 

This code was obsoleted by the rework of Layer::Handle

Test: Builds
Change-Id: I4ab04ec7e28e1eed3585cc33886333b8860919cf
parent 18d90eaf

services/surfaceflinger/SurfaceFlinger.cpp

+3 −7
Original line number Diff line number Diff line
@@ -3184,19 +3184,15 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
    return NO_ERROR;

}



status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer, bool topLevelOnly) {

status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {

    Mutex::Autolock _l(mStateLock);

    return removeLayerLocked(mStateLock, layer, topLevelOnly);

    return removeLayerLocked(mStateLock, layer);

}



status_t SurfaceFlinger::removeLayerLocked(const Mutex& lock, const sp<Layer>& layer,

                                           bool topLevelOnly) {

status_t SurfaceFlinger::removeLayerLocked(const Mutex& lock, const sp<Layer>& layer) {

    const auto& p = layer->getParent();

    ssize_t index;

    if (p != nullptr) {

        if (topLevelOnly) {

            return NO_ERROR;

        }

        index = p->removeChild(layer);

    } else {

        index = mCurrentState.layersSortedByZ.remove(layer);

services/surfaceflinger/SurfaceFlinger.h

+2 −2
Original line number Diff line number Diff line
@@ -592,8 +592,8 @@ private: 
    void onHandleDestroyed(const sp<Layer>& layer);



    // remove a layer from SurfaceFlinger immediately

    status_t removeLayer(const sp<Layer>& layer, bool topLevelOnly = false);

    status_t removeLayerLocked(const Mutex&, const sp<Layer>& layer, bool topLevelOnly = false);

    status_t removeLayer(const sp<Layer>& layer);

    status_t removeLayerLocked(const Mutex&, const sp<Layer>& layer);



    // add a layer to SurfaceFlinger

    status_t addClientLayer(const sp<Client>& client,