Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7b488da3: am 2604a74b: am 18b5a23d: Merge "Debug for 13924095." into lmp-dev

Browse Source 
* commit '7b488da3ff16f5342013e666ab6b83856d71a258':
  Debug for 13924095.
This commit is contained in:
Craig Mautner
2014-08-08 04:10:06 +00:00
committed by Android Git Automerger
parent 830b81d84d 7772d24e6e
commit 161dd04fbb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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,