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.
Change-Id: I6cc2bc9768b5603b5829c21a79456848376a7896
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 9e08317..060f0c9 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 @@
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)
