Merge "Adds the ability to start a user in background" into lmp-dev (75c33d9d) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,7 @@ public class Am extends BaseCommand {
	" am to-uri [INTENT]\n" +		" am to-uri [INTENT]\n" +
	" am to-intent-uri [INTENT]\n" +		" am to-intent-uri [INTENT]\n" +
	" am switch-user <USER_ID>\n" +		" am switch-user <USER_ID>\n" +
			" am start-user <USER_ID>\n" +
	" am stop-user <USER_ID>\n" +		" am stop-user <USER_ID>\n" +
	" am stack start <DISPLAY_ID> <INTENT>\n" +		" am stack start <DISPLAY_ID> <INTENT>\n" +
	" am stack movetask <TASK_ID> <STACK_ID> [true\|false]\n" +		" am stack movetask <TASK_ID> <STACK_ID> [true\|false]\n" +
	@@ -233,8 +234,11 @@ public class Am extends BaseCommand {
	"am switch-user: switch to put USER_ID in the foreground, starting\n" +		"am switch-user: switch to put USER_ID in the foreground, starting\n" +
	" execution of that user if it is currently stopped.\n" +		" execution of that user if it is currently stopped.\n" +
	"\n" +		"\n" +
			"am start-user: start USER_ID in background if it is currently stopped,\n" +
			" use switch-user if you want to start the user in foreground.\n" +
			"\n" +
	"am stop-user: stop execution of USER_ID, not allowing it to run any\n" +		"am stop-user: stop execution of USER_ID, not allowing it to run any\n" +
	" code until a later explicit switch to it.\n" +		" code until a later explicit start or switch to it.\n" +
	"\n" +		"\n" +
	"am stack start: start a new activity on <DISPLAY_ID> using <INTENT>.\n" +		"am stack start: start a new activity on <DISPLAY_ID> using <INTENT>.\n" +
	"\n" +		"\n" +
	@@ -340,6 +344,8 @@ public class Am extends BaseCommand {
	runToUri(true);		runToUri(true);
	} else if (op.equals("switch-user")) {		} else if (op.equals("switch-user")) {
	runSwitchUser();		runSwitchUser();
			} else if (op.equals("start-user")) {
			runStartUserInBackground();
	} else if (op.equals("stop-user")) {		} else if (op.equals("stop-user")) {
	runStopUser();		runStopUser();
	} else if (op.equals("stack")) {		} else if (op.equals("stack")) {
	@@ -1133,6 +1139,16 @@ public class Am extends BaseCommand {
	mAm.switchUser(Integer.parseInt(user));		mAm.switchUser(Integer.parseInt(user));
	}		}

			private void runStartUserInBackground() throws Exception {
			String user = nextArgRequired();
			boolean success = mAm.startUserInBackground(Integer.parseInt(user));
			if (success) {
			System.out.println("Success: user started");
			} else {
			System.err.println("Error: could not start user");
			}
			}

	private void runStopUser() throws Exception {		private void runStopUser() throws Exception {
	String user = nextArgRequired();		String user = nextArgRequired();
	int res = mAm.stopUser(Integer.parseInt(user), null);		int res = mAm.stopUser(Integer.parseInt(user), null);