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

Commit 30b390cb authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Android (Google) Code Review
Browse files

Merge "Update LayerVector's order after modifying relative layer."

parents 74074f15 64f7b420

services/surfaceflinger/SurfaceFlinger.cpp

+3 −0
Original line number Diff line number Diff line
@@ -2982,7 +2982,10 @@ uint32_t SurfaceFlinger::setClientStateLocked( 
            }

        }

        if (what & layer_state_t::eRelativeLayerChanged) {

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

            if (layer->setRelativeLayer(s.relativeLayerHandle, s.z)) {

                mCurrentState.layersSortedByZ.removeAt(idx);

                mCurrentState.layersSortedByZ.add(layer);

                flags |= eTransactionNeeded|eTraversalNeeded;

            }

        }

services/surfaceflinger/SurfaceFlinger_hwc1.cpp

+8 −0
Original line number Diff line number Diff line
@@ -2577,6 +2577,14 @@ uint32_t SurfaceFlinger::setClientStateLocked( 
                }

            }

        }

        if (what & layer_state_t::eRelativeLayerChanged) {

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

            if (layer->setRelativeLayer(s.relativeLayerHandle, s.z)) {

                mCurrentState.layersSortedByZ.removeAt(idx);

                mCurrentState.layersSortedByZ.add(layer);

                flags |= eTransactionNeeded|eTraversalNeeded;

            }

        }

        if (what & layer_state_t::eSizeChanged) {

            if (layer->setSize(s.w, s.h)) {

                flags |= eTraversalNeeded;