diff options
| author | Craig Mautner <cmautner@google.com> | 2014-08-13 18:06:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:35 +0000 |
| commit | eb829f2f9fa9348e85f1ff5e856e0525c53ddff6 (patch) | |
| tree | 683012218403f4daa5c7b2663f7a0d276762d0dd /services | |
| parent | 160c6fc1e9eeac87b6c0bd909aa9402e26046120 (diff) | |
| parent | a5d29971f8f4d463348e9de0f7af7e2e92a377a0 (diff) | |
| download | frameworks_base-eb829f2f9fa9348e85f1ff5e856e0525c53ddff6.zip frameworks_base-eb829f2f9fa9348e85f1ff5e856e0525c53ddff6.tar.gz frameworks_base-eb829f2f9fa9348e85f1ff5e856e0525c53ddff6.tar.bz2 | |
Merge "Disassociate system windows from apps" into lmp-dev
Diffstat (limited to 'services')
| -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 26dc448..cd9f050 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2314,6 +2314,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, |