From bc89e59295a39c9ce8f946d1f2c229d1ffdd6871 Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Wed, 10 Feb 2016 21:20:21 -0800 Subject: [PATCH] Correct error in window lifetime. Correct a simple logic error where application stop state is incorrectly reset. Bug: 27112965 Change-Id: I3058378c1e240e0a02665ad479678723e14921aa --- .../core/java/com/android/server/wm/WindowManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index d1ffaa07ed13c..2bcbb39e368a8 100644 --- 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