diff options
author | 2025-04-02 06:19:05 -0700 | |
---|---|---|
committer | 2025-04-02 19:33:05 -0700 | |
commit | 1a5e95ed7c5a0c17a4ac01dff06b8cb044ab3284 (patch) | |
tree | 2f063d56de120b892d73342b0bb246c53e95a7fe | |
parent | 4b4d7ddc8fa9cf98756bf970691a1438ffc23ae1 (diff) |
Revert "Wrap reparent in a try-catch."
This reverts commit 09782e973223ebc1d3fecc14877a11fa3e66e51a.
Reason for revert: part of a revert chain to CP fix to b/404507270. The end state is the same as currently at ToT, but need to have cherry-pickable CLs for branches that are in CP mode.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c400b92c7fea9c0e59b8c0311aeae68f188c6534)
Merged-In: I4dda41ef22422e9ef502a71ee554125d02c987f0
Change-Id: I4dda41ef22422e9ef502a71ee554125d02c987f0
-rw-r--r-- | packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java | 4 |
1 files changed, 1 insertions, 3 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 041ccb567146..9e08317d2c6b 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java @@ -199,10 +199,8 @@ public abstract class RemoteAnimationRunnerCompat extends IRemoteAnimationRunner info.releaseAllSurfaces(); // Make sure that the transition leashes created are not leaked. for (SurfaceControl leash : leashMap.values()) { - try { + if (leash.isValid()) { 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 |