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

Commit 311da222 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "SurfaceFlinger.cpp: Check for NULL in removeLayer()" into gingerbread

parents f6337ee4 b7ee5916

services/surfaceflinger/SurfaceFlinger.cpp

+7 −4
Original line number Diff line number Diff line
@@ -1081,10 +1081,13 @@ ssize_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 


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

{

    status_t err = NAME_NOT_FOUND;

    Mutex::Autolock _l(mStateLock);

    status_t err = purgatorizeLayer_l(layer);

    if (layer != 0) {

        err = purgatorizeLayer_l(layer);

        if (err == NO_ERROR)

            setTransactionFlags(eTransactionNeeded);

    }

    return err;

}
@@ -1105,7 +1108,7 @@ status_t SurfaceFlinger::removeLayer_l(const sp<LayerBase>& layerBase) 
status_t SurfaceFlinger::purgatorizeLayer_l(const sp<LayerBase>& layerBase)

{

    // remove the layer from the main list (through a transaction).

    ssize_t err = removeLayer_l(layerBase);

    status_t err = removeLayer_l(layerBase);



    layerBase->onRemoved();