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

Commit 8ce1c84a authored by Pablo Ceballos's avatar Pablo Ceballos Committed by Android (Google) Code Review
Browse files

Merge "SF: Prevent accidentally re-adding a removed layer"

parents b744ac2a 47db6ebf

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2241,7 +2241,7 @@ uint32_t SurfaceFlinger::setClientStateLocked( 
        if (what & layer_state_t::eLayerChanged) {

            // NOTE: index needs to be calculated before we update the state

            ssize_t idx = mCurrentState.layersSortedByZ.indexOf(layer);

            if (layer->setLayer(s.z)) {

            if (layer->setLayer(s.z) && idx >= 0) {

                mCurrentState.layersSortedByZ.removeAt(idx);

                mCurrentState.layersSortedByZ.add(layer);

                // we need traversal (state changed)
@@ -2277,7 +2277,7 @@ uint32_t SurfaceFlinger::setClientStateLocked( 
        if (what & layer_state_t::eLayerStackChanged) {

            // NOTE: index needs to be calculated before we update the state

            ssize_t idx = mCurrentState.layersSortedByZ.indexOf(layer);

            if (layer->setLayerStack(s.layerStack)) {

            if (layer->setLayerStack(s.layerStack) && idx >= 0) {

                mCurrentState.layersSortedByZ.removeAt(idx);

                mCurrentState.layersSortedByZ.add(layer);

                // we need traversal (state changed)