Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2891ee35 authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android Build Coastguard Worker
Browse files

Revert "Fix NPE when reparenting a leash that has already been released." 

This reverts commit 67f210f7.

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
parent 1a5e95ed

packages/SystemUI/animation/src/com/android/systemui/animation/RemoteAnimationRunnerCompat.java

+1 −3
Original line number Diff line number Diff line
@@ -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()) {

                        if (leash.isValid()) {

                        finishTransaction.reparent(leash, null);

                    }

                    }

                    // Don't release here since launcher might still be using them. Instead

                    // let launcher release them (eg. via RemoteAnimationTargets)

                    leashMap.clear();