Prevent leak of transition leashes in RemoteAnimationRunnerCompat.

Bug: 390422470
Flag: EXEMPT bugfix
Test: manual + winscope
Change-Id: Ibbfcbb87e5f8b0007d26a4151ac6de8ef2c5856a

1 files changed, 4 insertions, 0 deletions

diff --git a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
index ca94482b9c5a..2697b73a1c58 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
@@ -197,6 +197,10 @@ public abstract class RemoteAnimationRunnerCompat extends IRemoteAnimationRunner
                     // Release surface references now. This is apparently to free GPU memory
                     // before GC would.
                     info.releaseAllSurfaces();
+                    // Make sure that the transition leashes created are not leaked.
+                    for (SurfaceControl leash : leashMap.values()) {
+                        finishTransaction.reparent(leash, null);
+                    }
                     // Don't release here since launcher might still be using them. Instead
                     // let launcher release them (eg. via RemoteAnimationTargets)
                     leashMap.clear();