am 18b5a23d: Merge "Debug for 13924095." into lmp-dev (3d323c71) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowManagerService.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2347,6 +2347,7 @@ public class WindowManagerService extends IWindowManager.Stub
	origId = Binder.clearCallingIdentity();		origId = Binder.clearCallingIdentity();

	if (addToken) {		if (addToken) {
			Slog.w("BadTokenDebug", "addWindow: Adding token=" + token + " attrs.token=" + attrs.token);
	mTokenMap.put(attrs.token, token);		mTokenMap.put(attrs.token, token);
	}		}
	win.attach();		win.attach();
	@@ -2628,7 +2629,9 @@ public class WindowManagerService extends IWindowManager.Stub
	+ token.windows.size());		+ token.windows.size());
	if (token.windows.size() == 0) {		if (token.windows.size() == 0) {
	if (!token.explicit) {		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) {		} else if (atoken != null) {
	atoken.firstWindowDrawn = false;		atoken.firstWindowDrawn = false;
	}		}
	@@ -3414,6 +3417,7 @@ public class WindowManagerService extends IWindowManager.Stub
	return;		return;
	}		}
	wtoken = new WindowToken(this, token, type, true);		wtoken = new WindowToken(this, token, type, true);
			Slog.w("BadTokenDebug", "addWindowToken: Adding token=" + token + " wtoken=" + wtoken);
	mTokenMap.put(token, wtoken);		mTokenMap.put(token, wtoken);
	if (type == TYPE_WALLPAPER) {		if (type == TYPE_WALLPAPER) {
	mWallpaperTokens.add(wtoken);		mWallpaperTokens.add(wtoken);
	@@ -3432,6 +3436,8 @@ public class WindowManagerService extends IWindowManager.Stub
	synchronized(mWindowMap) {		synchronized(mWindowMap) {
	DisplayContent displayContent = null;		DisplayContent displayContent = null;
	WindowToken wtoken = mTokenMap.remove(token);		WindowToken wtoken = mTokenMap.remove(token);
			Slog.w("BadTokenDebug", "removeWindowToken: Removing token=" + token + " removed=" + wtoken
			+ " Callers=" + Debug.getCallers(3));
	if (wtoken != null) {		if (wtoken != null) {
	boolean delayed = false;		boolean delayed = false;
	if (!wtoken.hidden) {		if (!wtoken.hidden) {
	@@ -3548,6 +3554,7 @@ public class WindowManagerService extends IWindowManager.Stub
	task.addAppToken(addPos, atoken);		task.addAppToken(addPos, atoken);
	}		}

			Slog.w("BadTokenDebug", "addAppToken: Adding token=" + token.asBinder() + " atoken=" + atoken);
	mTokenMap.put(token.asBinder(), atoken);		mTokenMap.put(token.asBinder(), atoken);

	// Application tokens start out hidden.		// Application tokens start out hidden.
	@@ -4636,6 +4643,7 @@ public class WindowManagerService extends IWindowManager.Stub
	final long origId = Binder.clearCallingIdentity();		final long origId = Binder.clearCallingIdentity();
	synchronized(mWindowMap) {		synchronized(mWindowMap) {
	WindowToken basewtoken = mTokenMap.remove(token);		WindowToken basewtoken = mTokenMap.remove(token);
			Slog.w("BadTokenDebug", "removeAppToke: Removing token=" + token + " removed=" + basewtoken);
	if (basewtoken != null && (wtoken=basewtoken.appWindowToken) != null) {		if (basewtoken != null && (wtoken=basewtoken.appWindowToken) != null) {
	if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Removing app token: " + wtoken);		if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "Removing app token: " + wtoken);
	delayed = setTokenVisibilityLocked(wtoken, null, false,		delayed = setTokenVisibilityLocked(wtoken, null, false,