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

Commit 3e3474ea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Re-add mistakenly removed lock in SurfaceFlinger::removeLayer."

parents 4e67f0f8 7f9b899c

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2519,6 +2519,8 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
}



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

    Mutex::Autolock _l(mStateLock);



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

    const ssize_t index = (p != nullptr) ? p->removeChild(layer) :

        mCurrentState.layersSortedByZ.remove(layer);

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2296,6 +2296,8 @@ status_t SurfaceFlinger::addClientLayer(const sp<Client>& client, 
}



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

    Mutex::Autolock _l(mStateLock);



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

    const ssize_t index = (p != nullptr) ? p->removeChild(layer) :

             mCurrentState.layersSortedByZ.remove(layer);