Merge "Wrap reparent in a try-catch." into main

1 files changed, 3 insertions, 1 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 9e08317d2c6b..041ccb567146 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java
@@ -199,8 +199,10 @@ public abstract class RemoteAnimationRunnerCompat extends IRemoteAnimationRunner
                     info.releaseAllSurfaces();
                     // Make sure that the transition leashes created are not leaked.
                     for (SurfaceControl leash : leashMap.values()) {
-                        if (leash.isValid()) {
+                        try {
                             finishTransaction.reparent(leash, null);
+                        } catch (Exception e) {
+                            Log.e(TAG, "Failed to reparent leash", e);
                         }
                     }
                     // Don't release here since launcher might still be using them. Instead