diff options
| author | Craig Mautner <cmautner@google.com> | 2014-08-12 18:57:49 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-08-12 18:57:49 -0700 |
| commit | a5d29971f8f4d463348e9de0f7af7e2e92a377a0 (patch) | |
| tree | 6a6cff375a71f0a5d4e26130a34137927df00ead | |
| parent | 015cb5dc71b653db9eb61aaa3798df485df47ed9 (diff) | |
| download | frameworks_base-a5d29971f8f4d463348e9de0f7af7e2e92a377a0.zip frameworks_base-a5d29971f8f4d463348e9de0f7af7e2e92a377a0.tar.gz frameworks_base-a5d29971f8f4d463348e9de0f7af7e2e92a377a0.tar.bz2 | |
Disassociate system windows from apps
If an app launches a system window remove the app token.
Fixes bug 16825063.
Change-Id: I7c7403e0958f3cd9f6dd5e2964b2e9cabc51ded7
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 4e711ba..a6f4be8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2305,6 +2305,10 @@ public class WindowManagerService extends IWindowManager.Stub + attrs.token + ". Aborting."); return WindowManagerGlobal.ADD_BAD_APP_TOKEN; } + } else if (token.appWindowToken != null) { + Slog.i(TAG, "Non-null appWindowToken for system window of type=" + type); + // app token should be null for any other window types. + token.appWindowToken = null; } win = new WindowState(this, session, client, token, |