Reparent children before reparenting to null
When we reparent a layer to null, we remove its child layers from current state and remove
their relative z. If the children are reparented in the same transaction, then we have to
make sure we reparent the children first so we do not lose their relative z order.
Test: atest SurfaceFlinger_test
Bug: 132205507
Change-Id: I6b73758065c7eb46ac3b60a1b40f6839be24b09c
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 8bf6b99..fc1f318 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4052,15 +4052,6 @@
// We don't trigger a traversal here because if no other state is
// changed, we don't want this to cause any more work
}
- if (what & layer_state_t::eReparent) {
- bool hadParent = layer->hasParent();
- if (layer->reparent(s.parentHandleForChild)) {
- if (!hadParent) {
- mCurrentState.layersSortedByZ.remove(layer);
- }
- flags |= eTransactionNeeded|eTraversalNeeded;
- }
- }
if (what & layer_state_t::eReparentChildren) {
if (layer->reparentChildren(s.reparentHandle)) {
flags |= eTransactionNeeded|eTraversalNeeded;
@@ -4121,6 +4112,19 @@
flags |= eTraversalNeeded;
}
}
+ // This has to happen after we reparent children because when we reparent to null we remove
+ // child layers from current state and remove its relative z. If the children are reparented in
+ // the same transaction, then we have to make sure we reparent the children first so we do not
+ // lose its relative z order.
+ if (what & layer_state_t::eReparent) {
+ bool hadParent = layer->hasParent();
+ if (layer->reparent(s.parentHandleForChild)) {
+ if (!hadParent) {
+ mCurrentState.layersSortedByZ.remove(layer);
+ }
+ flags |= eTransactionNeeded | eTraversalNeeded;
+ }
+ }
std::vector<sp<CallbackHandle>> callbackHandles;
if ((what & layer_state_t::eHasListenerCallbacksChanged) && (!listenerCallbacks.empty())) {
for (const auto& [listener, callbackIds] : listenerCallbacks) {