Merge "Main trace for "start user"" (1a82e746) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerShellCommand.java

+17 −12

Original line number	Diff line number	Diff line
		@@ -2153,6 +2153,8 @@ final class ActivityManagerShellCommand extends ShellCommand {
		boolean success;
		String displaySuffix;

		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "shell_runStartUser" + userId);
		try {
		if (displayId == Display.INVALID_DISPLAY) {
		success = mInterface.startUserInBackgroundWithListener(userId, waiter);
		displaySuffix = "";
		@@ -2167,6 +2169,9 @@ final class ActivityManagerShellCommand extends ShellCommand {
		if (wait && success) {
		success = waiter.waitForFinish(USER_OPERATION_TIMEOUT_MS);
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}

		if (success) {
		pw.println("Success: user started" + displaySuffix);