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

Commit 044c4d97 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Add the app back to mOpeningApps if transition is unset but ready." into nyc-dev am: c0b8c119 

am: 97d92455

* commit '97d92455':
  Add the app back to mOpeningApps if transition is unset but ready.

Change-Id: I69a84bd61ec8182ddcce80d54004c43d3afc0ada
parents 69753bb8 97d92455

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

+7 −2
Original line number Diff line number Diff line
@@ -4292,9 +4292,13 @@ public class WindowManagerService extends IWindowManager.Stub 
                wtoken.appDied = false;

                wtoken.removeAllWindows();

            } else if (visible) {

                if (!mAppTransition.isTransitionSet() && mAppTransition.isReady()) {

                    // Add the app mOpeningApps if transition is unset but ready. This means

                    // we're doing a screen freeze, and the unfreeze will wait for all opening

                    // apps to be ready.

                    mOpeningApps.add(wtoken);

                }

                wtoken.startingMoved = false;



                // If the token is currently hidden (should be the common case), or has been

                // stopped, then we need to set up to wait for its windows to be ready.

                if (wtoken.hidden || wtoken.mAppStopped) {
@@ -4338,6 +4342,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                wtoken.inPendingTransaction = true;

                if (visible) {

                    mOpeningApps.add(wtoken);

                    wtoken.mEnteringAnimation = true;

                } else {

                    mClosingApps.add(wtoken);