Merge "Correct error in window lifetime." into nyc-dev

2016-02-11 23:06:25 +00:00
parent 73f1025f2d bc89e59295
commit 2b63730837
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -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