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

Commit b34f48ff authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Correct exit animation window retention logic."

parents b5c1f3b4 8aa603d8

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -2229,9 +2229,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            // trigger its removal.

            // trigger its removal.

            final boolean lastWinStartingNotAnimating = startingWindow && appToken!= null

            final boolean lastWinStartingNotAnimating = startingWindow && appToken!= null

                    && appToken.allAppWindows.size() == 1 && !isAnimating;

                    && appToken.allAppWindows.size() == 1 && !isAnimating;

            if (!lastWinStartingNotAnimating && (win.mExiting || isAnimating)) {

            if (!lastWinStartingNotAnimating && win.mExiting) {

                // The exit animation is running... wait for it!

                // The exit animation is running... wait for it!

                win.mExiting = true;

                win.mRemoveOnExit = true;

                win.mRemoveOnExit = true;

                win.setDisplayLayoutNeeded();

                win.setDisplayLayoutNeeded();

                final boolean focusChanged = updateFocusedWindowLocked(

                final boolean focusChanged = updateFocusedWindowLocked(