Merge "Clearing mDestroying flag when app is made visible again" into nyc-dev

2016-02-13 18:09:46 +00:00
parent f35b991438 5471e90ef9
commit 3dbcd203c5
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -310,6 +310,11 @@ class AppWindowToken extends WindowToken {
            if (!(win.mRemoveOnExit && win.mExiting)) {
                win.mExiting = exiting;
            }
+            // If we're no longer exiting, remove the window from destroying list
+            if (!win.mExiting && win.mDestroying) {
+                win.mDestroying = false;
+                service.mDestroySurface.remove(win);
+            }
        }
    }

@@ -326,7 +331,7 @@ class AppWindowToken extends WindowToken {
            }

            if (!mAppStopped && !win.mClientRemoveRequested) {
-                return;
+                continue;
            }

            win.destroyOrSaveSurface();