diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-12-05 13:48:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-05 13:48:45 +0000 |
| commit | d52efa56adaca0bc70fb72082c7c663adcb669cc (patch) | |
| tree | 949d636fd113e42356fe3283d7c3aaefed9ff8ba | |
| parent | f5cf390e416e964b915b8dcf3339230c93756547 (diff) | |
| parent | aec55ff58ca4ae1056744015cc72771866fc347c (diff) | |
Merge "Ensure non app WindowTokens are removed when closing."
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowToken.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java index c9d7b70d6951..a3d4b71a68af 100644 --- 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; |