From 9a006258b5f0221323d7a4f0672b1604375119ba Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Thu, 7 Aug 2014 18:36:06 -0700
Subject: [PATCH] Debug for 13924095.

Add logging for 13924095. All logging uses TAG "BadTokenDebug".

Change-Id: I3404e98d8c221cbd183845f479cf4074266b5cb2
---
 .../com/android/server/wm/WindowManagerService.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 87aabe21e02c5..4e711ba52d4de 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -2347,6 +2347,7 @@ public class WindowManagerService extends IWindowManager.Stub
             origId = Binder.clearCallingIdentity();
 
             if (addToken) {
+                Slog.w("BadTokenDebug", "addWindow: Adding token=" + token + " attrs.token=" + attrs.token);
                 mTokenMap.put(attrs.token, token);
             }
             win.attach();
@@ -2628,7 +2629,9 @@ public class WindowManagerService extends IWindowManager.Stub
                 + token.windows.size());
         if (token.windows.size() == 0) {
             if (!token.explicit) {
-                mTokenMap.remove(token.token);
+                WindowToken wtoken = mTokenMap.remove(token.token);
+                Slog.w("BadTokenDebug", "removeWindowInnerLocked: Removing token=" + token + " removed=" +
+                        wtoken + " Callers=" + Debug.getCallers(4));
             } else if (atoken != null) {
                 atoken.firstWindowDrawn = false;
             }
@@ -3414,6 +3417,7 @@ public class WindowManagerService extends IWindowManager.Stub
                 return;
             }
             wtoken = new WindowToken(this, token, type, true);
+            Slog.w("BadTokenDebug", "addWindowToken: Adding token=" + token + " wtoken=" + wtoken);
             mTokenMap.put(token, wtoken);
             if (type == TYPE_WALLPAPER) {
                 mWallpaperTokens.add(wtoken);
@@ -3432,6 +3436,8 @@ public class WindowManagerService extends IWindowManager.Stub
         synchronized(mWindowMap) {
             DisplayContent displayContent = null;
             WindowToken wtoken = mTokenMap.remove(token);
+            Slog.w("BadTokenDebug", "removeWindowToken: Removing token=" + token + " removed=" + wtoken
+                    + " Callers=" + Debug.getCallers(3));
             if (wtoken != null) {
                 boolean delayed = false;
                 if (!wtoken.hidden) {
@@ -3548,6 +3554,7 @@ public class WindowManagerService extends IWindowManager.Stub
                 task.addAppToken(addPos, atoken);
             }
 
+            Slog.w("BadTokenDebug", "addAppToken: Adding token=" + token.asBinder() + " atoken=" + atoken);
             mTokenMap.put(token.asBinder(), atoken);
 
             // Application tokens start out hidden.
@@ -4636,6 +4643,7 @@ public class WindowManagerService extends IWindowManager.Stub
         final long origId = Binder.clearCallingIdentity();
         synchronized(mWindowMap) {
             WindowToken basewtoken = mTokenMap.remove(token);
+            Slog.w("BadTokenDebug", "removeAppToke: Removing token=" + token + " removed=" + basewtoken);
             if (basewtoken != null && (wtoken=basewtoken.appWindowToken) != null) {
                 if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Removing app token: " + wtoken);
                 delayed = setTokenVisibilityLocked(wtoken, null, false,