From a5d29971f8f4d463348e9de0f7af7e2e92a377a0 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Tue, 12 Aug 2014 18:57:49 -0700
Subject: [PATCH] Disassociate system windows from apps

If an app launches a system window remove the app token.

Fixes bug 16825063.

Change-Id: I7c7403e0958f3cd9f6dd5e2964b2e9cabc51ded7
---
 .../core/java/com/android/server/wm/WindowManagerService.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 4e711ba52d4de..a6f4be8db86e8 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,