Merge "Avoid reparenting an invalid leash." into main

1 files changed, 2 insertions, 1 deletions

diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt
index 440a81fc2152..0680faf5226a 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt
@@ -1483,7 +1483,8 @@ constructor(
             // TODO(b/397646693): remove this exception.
             val isEligibleForReparenting = controller.isLaunching
             val viewRoot = controller.transitionContainer.viewRootImpl
-            val skipReparenting = skipReparentTransaction || viewRoot == null
+            val skipReparenting =
+                skipReparentTransaction || !window.leash.isValid || viewRoot == null
             if (moveTransitionAnimationLayer() && isEligibleForReparenting && !skipReparenting) {
                 reparent = true
             }