diff options
| author | 2025-04-02 06:19:15 -0700 | |
|---|---|---|
| committer | 2025-04-02 19:33:22 -0700 | |
| commit | 2891ee35af142523239a8acde9261b1f81d57f4c (patch) | |
| tree | 93bf899c5e5820fc30a0bc7a58b7f631bb0be87f | |
| parent | 1a5e95ed7c5a0c17a4ac01dff06b8cb044ab3284 (diff) | |
Revert "Fix NPE when reparenting a leash that has already been released."
This reverts commit 67f210f77a650094eacdfae07a40aabafc462c51.
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:62c16670a9604468059235f950928a8e0ab7626b)
Merged-In: I6cc2bc9768b5603b5829c21a79456848376a7896
Change-Id: I6cc2bc9768b5603b5829c21a79456848376a7896
| -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 9e08317d2c6b..060f0c94732d 100644 --- a/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java +++ b/packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java @@ -199,9 +199,7 @@ 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()) { - finishTransaction.reparent(leash, null); - } + finishTransaction.reparent(leash, null); } // Don't release here since launcher might still be using them. Instead // let launcher release them (eg. via RemoteAnimationTargets) |