Merge "Ensure non app WindowTokens are removed when closing."

2017-12-05 13:48:45 +00:00
parent f5cf390e41 aec55ff58c
commit d52efa56ad
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowToken.java
+++ b/services/core/java/com/android/server/wm/WindowToken.java
@@ -125,6 +125,11 @@ class WindowToken extends WindowContainer<WindowState> {
    }

    void setExiting() {
+        if (mChildren.size() == 0) {
+            super.removeImmediately();
+            return;
+        }
+
        // This token is exiting, so allow it to be removed when it no longer contains any windows.
        mPersistOnEmpty = false;