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

Commit 8bed4843 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am d720dedb: Merge "Clear the previous states before setting the new app visibility"

* commit 'd720dedb':
  Clear the previous states before setting the new app visibility
parents 5db6f1fa d720dedb
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -4644,19 +4644,19 @@ public class WindowManagerService extends IWindowManager.Stub
                    wtoken.hiddenRequested, HIDE_STACK_CRAWLS ?
                            null : new RuntimeException("here").fillInStackTrace());

            mOpeningApps.remove(wtoken);
            mClosingApps.remove(wtoken);
            wtoken.waitingToShow = wtoken.waitingToHide = false;
            wtoken.hiddenRequested = !visible;

            // If we are preparing an app transition, then delay changing
            // the visibility of this token until we execute that transition.
            if (okToDisplay() && mAppTransition.isTransitionSet()) {
                wtoken.hiddenRequested = !visible;

                if (!wtoken.startingDisplayed) {
                    if (DEBUG_APP_TRANSITIONS) Slog.v(
                            TAG, "Setting dummy animation on: " + wtoken);
                    wtoken.mAppAnimator.setDummyAnimation();
                }
                mOpeningApps.remove(wtoken);
                mClosingApps.remove(wtoken);
                wtoken.waitingToShow = wtoken.waitingToHide = false;
                wtoken.inPendingTransaction = true;
                if (visible) {
                    mOpeningApps.add(wtoken);