commit 1834f15830edc39d0e33ada93013e13251ff387f
author Luca Zuccarini <acul@google.com> Tue Jun 17 15:40:02 2025 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 24 19:48:33 2025 -0700
tree fd7afbe7958203c278099712ed42399e0d8e6b65
parent 3cedd62b5a0aa44023985befea55bd466eead99c

Catch all exceptions, not just illegal state, when reparenting.

I didn't realize that it can also throw an NPE, and my brain bypassed this information in bug reports. We got there eventually.

Fix: 418628826
Flag: EXEMPT bugfix
Test: atest ActivityTransitionAnimator
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b5e1edc1a348fdaef01bdb4eaba519e84320a5e6)
Merged-In: I8bfe9f93268032dd68d105fc4c81d5dc130e95c5
Change-Id: I8bfe9f93268032dd68d105fc4c81d5dc130e95c5

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt

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 e70f930..6107c05 100644
--- a/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt
+++ b/packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt
@@ -1546,7 +1546,7 @@
                                     it.reparent(window.leash, viewRoot.surfaceControl).apply()
                                 }
                                 reparent = true
-                            } catch (e: IllegalStateException) {
+                            } catch (e: Exception) {
                                 Log.e(TAG, "Failed to reparent transition leash: already released")
                                 reparent = false
                             }