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

Commit 4bf1f556 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "Correct error in window lifetime." into nyc-dev am: 2b637308 

am: cff765a2

* commit 'cff765a2':
  Correct error in window lifetime.
parents a0893ebb cff765a2

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

+2 −1
Original line number Diff line number Diff line
@@ -4236,7 +4236,6 @@ public class WindowManagerService extends IWindowManager.Stub 


            mOpeningApps.remove(wtoken);

            mClosingApps.remove(wtoken);

            wtoken.mAppStopped = false;

            wtoken.waitingToShow = false;

            wtoken.hiddenRequested = !visible;
@@ -4246,6 +4245,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                // if made visible again.

                wtoken.appDied = false;

                wtoken.removeAllWindows();

            } else if (visible) {

                wtoken.mAppStopped = false;

            }



            // If we are preparing an app transition, then delay changing