Merge "Disassociate system windows from apps" into lmp-dev

2014-08-13 18:06:18 +00:00
parent 160c6fc1e9 a5d29971f8
commit eb829f2f9f
1 changed files with 4 additions and 0 deletions
--- 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,