Merge "Do not add starting window after the starting data was cleared." into sc-dev (6397a19e) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −0

Original line number	Diff line number	Diff line
		@@ -3307,6 +3307,12 @@
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/TransitionController.java"
		},
		"1804245629": {
		"message": "Attempted to add starting window to token but already cleaned",
		"level": "WARN",
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"1810019902": {
		"message": "TRANSIT_FLAG_OPEN_BEHIND, adding %s to mOpeningApps",
		"level": "DEBUG",

+3 −0

Original line number	Diff line number	Diff line
		@@ -2247,6 +2247,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// Go ahead and cancel the request.
		ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Clearing startingData for token=%s", this);
		mStartingData = null;
		// Clean surface up since we don't want the window to be added back, so we don't
		// need to keep the surface to remove it.
		mStartingSurface = null;
		}
		return;
		}

+11 −5

Original line number	Diff line number	Diff line
		@@ -1600,12 +1600,18 @@ public class WindowManagerService extends IWindowManager.Stub
		ProtoLog.w(WM_ERROR, "Attempted to add window with exiting application token "
		+ ".%s Aborting.", token);
		return WindowManagerGlobal.ADD_APP_EXITING;
		} else if (type == TYPE_APPLICATION_STARTING && activity.mStartingWindow != null) {
		ProtoLog.w(WM_ERROR,
		"Attempted to add starting window to token with already existing"
		+ " starting window");
		} else if (type == TYPE_APPLICATION_STARTING) {
		if (activity.mStartingWindow != null) {
		ProtoLog.w(WM_ERROR, "Attempted to add starting window to "
		+ "token with already existing starting window");
		return WindowManagerGlobal.ADD_DUPLICATE_ADD;
		}
		if (activity.mStartingData == null) {
		ProtoLog.w(WM_ERROR, "Attempted to add starting window to "
		+ "token but already cleaned");
		return WindowManagerGlobal.ADD_DUPLICATE_ADD;
		}
		}
		} else if (rootType == TYPE_INPUT_METHOD) {
		if (token.windowType != TYPE_INPUT_METHOD) {
		ProtoLog.w(WM_ERROR, "Attempted to add input method window with bad token "