Switch am command to go through "cmd activity". (2882406d) · Commits · e / os / android_frameworks_base

cmds/am/am

+7 −7

Original line number	Original line	Diff line number	Diff line
	#!/system/bin/sh		#!/system/bin/sh
	#
	# Script to start "am" on the device, which has a very rudimentary		if [ "$1" != "instrument" ] ; then
	# shell.		cmd activity "$@"
	#		else
	base=/system		base=/system
	export CLASSPATH=$base/framework/am.jar		export CLASSPATH=$base/framework/am.jar
	exec app_process $base/bin com.android.commands.am.Am "$@"		exec app_process $base/bin com.android.commands.am.Am "$@"
			fi

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

+6 −355

Original line number	Original line	Diff line number	Diff line
	@@ -84,34 +84,9 @@ import java.util.List;

	public class Am extends BaseCommand {		public class Am extends BaseCommand {

	private static final String SHELL_PACKAGE_NAME = "com.android.shell";

	// Is the object moving in a positive direction?
	private static final boolean MOVING_FORWARD = true;
	// Is the object moving in the horizontal plan?
	private static final boolean MOVING_HORIZONTALLY = true;
	// Is the object current point great then its target point?
	private static final boolean GREATER_THAN_TARGET = true;
	// Amount we reduce the stack size by when testing a task re-size.
	private static final int STACK_BOUNDS_INSET = 10;

	public static final String NO_CLASS_ERROR_CODE = "Error type 3";
	private IActivityManager mAm;		private IActivityManager mAm;
	private IPackageManager mPm;		private IPackageManager mPm;

	private int mStartFlags = 0;
	private boolean mWaitOption = false;
	private boolean mStopOption = false;

	private int mRepeat = 0;
	private int mUserId;
	private String mReceiverPermission;

	private String mProfileFile;
	private int mSamplingInterval;
	private boolean mAutoStop;
	private int mStackId;

	/**		/**
	* Command-line entry point.		* Command-line entry point.
	*		*
	@@ -123,249 +98,11 @@ public class Am extends BaseCommand {

	@Override		@Override
	public void onShowUsage(PrintStream out) {		public void onShowUsage(PrintStream out) {
	PrintWriter pw = new PrintWriter(out);		try {
	pw.println(		runAmCmd(new String[] { "help" });
	"usage: am [subcommand] [options]\n" +		} catch (AndroidException e) {
	"usage: am start [-D] [-N] [-W] [-P <FILE>] [--start-profiler <FILE>]\n" +		e.printStackTrace(System.err);
	" [--sampling INTERVAL] [-R COUNT] [-S]\n" +		}
	" [--track-allocation] [--user <USER_ID> \| current] <INTENT>\n" +
	" am startservice [--user <USER_ID> \| current] <INTENT>\n" +
	" am stopservice [--user <USER_ID> \| current] <INTENT>\n" +
	" am force-stop [--user <USER_ID> \| all \| current] <PACKAGE>\n" +
	" am kill [--user <USER_ID> \| all \| current] <PACKAGE>\n" +
	" am kill-all\n" +
	" am broadcast [--user <USER_ID> \| all \| current] <INTENT>\n" +
	" am instrument [-r] [-e <NAME> <VALUE>] [-p <FILE>] [-w]\n" +
	" [--user <USER_ID> \| current]\n" +
	" [--no-window-animation] [--abi <ABI>] <COMPONENT>\n" +
	" am profile start [--user <USER_ID> current] [--sampling INTERVAL] <PROCESS> <FILE>\n" +
	" am profile stop [--user <USER_ID> current] [<PROCESS>]\n" +
	" am dumpheap [--user <USER_ID> current] [-n] <PROCESS> <FILE>\n" +
	" am set-debug-app [-w] [--persistent] <PACKAGE>\n" +
	" am clear-debug-app\n" +
	" am set-watch-heap <PROCESS> <MEM-LIMIT>\n" +
	" am clear-watch-heap\n" +
	" am bug-report [--progress]\n" +
	" am monitor [--gdb <port>]\n" +
	" am hang [--allow-restart]\n" +
	" am restart\n" +
	" am idle-maintenance\n" +
	" am screen-compat [on\|off] <PACKAGE>\n" +
	" am package-importance <PACKAGE>\n" +
	" am to-uri [INTENT]\n" +
	" am to-intent-uri [INTENT]\n" +
	" am to-app-uri [INTENT]\n" +
	" am switch-user <USER_ID>\n" +
	" am start-user <USER_ID>\n" +
	" am unlock-user <USER_ID> [TOKEN_HEX]\n" +
	" am stop-user [-w] [-f] <USER_ID>\n" +
	" am stack start <DISPLAY_ID> <INTENT>\n" +
	" am stack movetask <TASK_ID> <STACK_ID> [true\|false]\n" +
	" am stack resize <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
	" am stack resize-animated <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
	" am stack resize-docked-stack <LEFT,TOP,RIGHT,BOTTOM> [<TASK_LEFT,TASK_TOP,TASK_RIGHT,TASK_BOTTOM>]\n" +
	" am stack size-docked-stack-test: <STEP_SIZE> <l\|t\|r\|b> [DELAY_MS]\n" +
	" am stack move-top-activity-to-pinned-stack: <STACK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
	" am stack positiontask <TASK_ID> <STACK_ID> <POSITION>\n" +
	" am stack list\n" +
	" am stack info <STACK_ID>\n" +
	" am stack remove <STACK_ID>\n" +
	" am task lock <TASK_ID>\n" +
	" am task lock stop\n" +
	" am task resizeable <TASK_ID> [0 (unresizeable) \| 1 (crop_windows) \| 2 (resizeable) \| 3 (resizeable_and_pipable)]\n" +
	" am task resize <TASK_ID> <LEFT,TOP,RIGHT,BOTTOM>\n" +
	" am task drag-task-test <TASK_ID> <STEP_SIZE> [DELAY_MS] \n" +
	" am task size-task-test <TASK_ID> <STEP_SIZE> [DELAY_MS] \n" +
	" am get-config\n" +
	" am suppress-resize-config-changes <true\|false>\n" +
	" am set-inactive [--user <USER_ID>] <PACKAGE> true\|false\n" +
	" am get-inactive [--user <USER_ID>] <PACKAGE>\n" +
	" am send-trim-memory [--user <USER_ID>] <PROCESS>\n" +
	" [HIDDEN\|RUNNING_MODERATE\|BACKGROUND\|RUNNING_LOW\|MODERATE\|RUNNING_CRITICAL\|COMPLETE]\n" +
	" am get-current-user\n" +
	"\n" +
	"am start: start an Activity. Options are:\n" +
	" -D: enable debugging\n" +
	" -N: enable native debugging\n" +
	" -W: wait for launch to complete\n" +
	" --start-profiler <FILE>: start profiler and send results to <FILE>\n" +
	" --sampling INTERVAL: use sample profiling with INTERVAL microseconds\n" +
	" between samples (use with --start-profiler)\n" +
	" -P <FILE>: like above, but profiling stops when app goes idle\n" +
	" -R: repeat the activity launch <COUNT> times. Prior to each repeat,\n" +
	" the top activity will be finished.\n" +
	" -S: force stop the target app before starting the activity\n" +
	" --track-allocation: enable tracking of object allocations\n" +
	" --user <USER_ID> \| current: Specify which user to run as; if not\n" +
	" specified then run as the current user.\n" +
	" --stack <STACK_ID>: Specify into which stack should the activity be put.\n" +
	"\n" +
	"am startservice: start a Service. Options are:\n" +
	" --user <USER_ID> \| current: Specify which user to run as; if not\n" +
	" specified then run as the current user.\n" +
	"\n" +
	"am stopservice: stop a Service. Options are:\n" +
	" --user <USER_ID> \| current: Specify which user to run as; if not\n" +
	" specified then run as the current user.\n" +
	"\n" +
	"am force-stop: force stop everything associated with <PACKAGE>.\n" +
	" --user <USER_ID> \| all \| current: Specify user to force stop;\n" +
	" all users if not specified.\n" +
	"\n" +
	"am kill: Kill all processes associated with <PACKAGE>. Only kills.\n" +
	" processes that are safe to kill -- that is, will not impact the user\n" +
	" experience.\n" +
	" --user <USER_ID> \| all \| current: Specify user whose processes to kill;\n" +
	" all users if not specified.\n" +
	"\n" +
	"am kill-all: Kill all background processes.\n" +
	"\n" +
	"am broadcast: send a broadcast Intent. Options are:\n" +
	" --user <USER_ID> \| all \| current: Specify which user to send to; if not\n" +
	" specified then send to all users.\n" +
	" --receiver-permission <PERMISSION>: Require receiver to hold permission.\n" +
	"\n" +
	"am instrument: start an Instrumentation. Typically this target <COMPONENT>\n" +
	" is the form <TEST_PACKAGE>/<RUNNER_CLASS> or only <TEST_PACKAGE> if there \n" +
	" is only one instrumentation. Options are:\n" +
	" -r: print raw results (otherwise decode REPORT_KEY_STREAMRESULT). Use with\n" +
	" [-e perf true] to generate raw output for performance measurements.\n" +
	" -e <NAME> <VALUE>: set argument <NAME> to <VALUE>. For test runners a\n" +
	" common form is [-e <testrunner_flag> <value>[,<value>...]].\n" +
	" -p <FILE>: write profiling data to <FILE>\n" +
	" -m: Write output as protobuf (machine readable)\n" +
	" -w: wait for instrumentation to finish before returning. Required for\n" +
	" test runners.\n" +
	" --user <USER_ID> \| current: Specify user instrumentation runs in;\n" +
	" current user if not specified.\n" +
	" --no-window-animation: turn off window animations while running.\n" +
	" --abi <ABI>: Launch the instrumented process with the selected ABI.\n" +
	" This assumes that the process supports the selected ABI.\n" +
	"\n" +
	"am trace-ipc: Trace IPC transactions.\n" +
	" start: start tracing IPC transactions.\n" +
	" stop: stop tracing IPC transactions and dump the results to file.\n" +
	" --dump-file <FILE>: Specify the file the trace should be dumped to.\n" +
	"\n" +
	"am profile: start and stop profiler on a process. The given <PROCESS> argument\n" +
	" may be either a process name or pid. Options are:\n" +
	" --user <USER_ID> \| current: When supplying a process name,\n" +
	" specify user of process to profile; uses current user if not specified.\n" +
	"\n" +
	"am dumpheap: dump the heap of a process. The given <PROCESS> argument may\n" +
	" be either a process name or pid. Options are:\n" +
	" -n: dump native heap instead of managed heap\n" +
	" --user <USER_ID> \| current: When supplying a process name,\n" +
	" specify user of process to dump; uses current user if not specified.\n" +
	"\n" +
	"am set-debug-app: set application <PACKAGE> to debug. Options are:\n" +
	" -w: wait for debugger when application starts\n" +
	" --persistent: retain this value\n" +
	"\n" +
	"am clear-debug-app: clear the previously set-debug-app.\n" +
	"\n" +
	"am set-watch-heap: start monitoring pss size of <PROCESS>, if it is at or\n" +
	" above <HEAP-LIMIT> then a heap dump is collected for the user to report\n" +
	"\n" +
	"am clear-watch-heap: clear the previously set-watch-heap.\n" +
	"\n" +
	"am bug-report: request bug report generation; will launch a notification\n" +
	" when done to select where it should be delivered. Options are: \n" +
	" --progress: will launch a notification right away to show its progress.\n" +
	"\n" +
	"am monitor: start monitoring for crashes or ANRs.\n" +
	" --gdb: start gdbserv on the given port at crash/ANR\n" +
	"\n" +
	"am hang: hang the system.\n" +
	" --allow-restart: allow watchdog to perform normal system restart\n" +
	"\n" +
	"am restart: restart the user-space system.\n" +
	"\n" +
	"am idle-maintenance: perform idle maintenance now.\n" +
	"\n" +
	"am screen-compat: control screen compatibility mode of <PACKAGE>.\n" +
	"\n" +
	"am package-importance: print current importance of <PACKAGE>.\n" +
	"\n" +
	"am to-uri: print the given Intent specification as a URI.\n" +
	"\n" +
	"am to-intent-uri: print the given Intent specification as an intent: URI.\n" +
	"\n" +
	"am to-app-uri: print the given Intent specification as an android-app: URI.\n" +
	"\n" +
	"am switch-user: switch to put USER_ID in the foreground, starting\n" +
	" execution of that user if it is currently stopped.\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" +
	" code until a later explicit start or switch to it.\n" +
	" -w: wait for stop-user to complete.\n" +
	" -f: force stop even if there are related users that cannot be stopped.\n" +
	"\n" +
	"am stack start: start a new activity on <DISPLAY_ID> using <INTENT>.\n" +
	"\n" +
	"am stack movetask: move <TASK_ID> from its current stack to the top (true) or" +
	" bottom (false) of <STACK_ID>.\n" +
	"\n" +
	"am stack resize: change <STACK_ID> size and position to <LEFT,TOP,RIGHT,BOTTOM>.\n" +
	"\n" +
	"am stack resize-docked-stack: change docked stack to <LEFT,TOP,RIGHT,BOTTOM>\n" +
	" and supplying temporary different task bounds indicated by\n" +
	" <TASK_LEFT,TOP,RIGHT,BOTTOM>\n" +
	"\n" +
	"am stack size-docked-stack-test: test command for sizing docked stack by\n" +
	" <STEP_SIZE> increments from the side <l>eft, <t>op, <r>ight, or <b>ottom\n" +
	" applying the optional [DELAY_MS] between each step.\n" +
	"\n" +
	"am stack move-top-activity-to-pinned-stack: moves the top activity from\n" +
	" <STACK_ID> to the pinned stack using <LEFT,TOP,RIGHT,BOTTOM> for the\n" +
	" bounds of the pinned stack.\n" +
	"\n" +
	"am stack positiontask: place <TASK_ID> in <STACK_ID> at <POSITION>" +
	"\n" +
	"am stack list: list all of the activity stacks and their sizes.\n" +
	"\n" +
	"am stack info: display the information about activity stack <STACK_ID>.\n" +
	"\n" +
	"am stack remove: remove stack <STACK_ID>.\n" +
	"\n" +
	"am task lock: bring <TASK_ID> to the front and don't allow other tasks to run.\n" +
	"\n" +
	"am task lock stop: end the current task lock.\n" +
	"\n" +
	"am task resizeable: change resizeable mode of <TASK_ID>.\n" +
	" 0 (unresizeable) \| 1 (crop_windows) \| 2 (resizeable) \| 3 (resizeable_and_pipable)\n" +
	"\n" +
	"am task resize: makes sure <TASK_ID> is in a stack with the specified bounds.\n" +
	" Forces the task to be resizeable and creates a stack if no existing stack\n" +
	" has the specified bounds.\n" +
	"\n" +
	"am task drag-task-test: test command for dragging/moving <TASK_ID> by\n" +
	" <STEP_SIZE> increments around the screen applying the optional [DELAY_MS]\n" +
	" between each step.\n" +
	"\n" +
	"am task size-task-test: test command for sizing <TASK_ID> by <STEP_SIZE>" +
	" increments within the screen applying the optional [DELAY_MS] between\n" +
	" each step.\n" +
	"\n" +
	"am get-config: retrieve the configuration and any recent configurations\n" +
	" of the device.\n" +
	"am suppress-resize-config-changes: suppresses configuration changes due to\n" +
	" user resizing an activity/task.\n" +
	"\n" +
	"am set-inactive: sets the inactive state of an app.\n" +
	"\n" +
	"am get-inactive: returns the inactive state of an app.\n" +
	"\n" +
	"am send-trim-memory: send a memory trim event to a <PROCESS>.\n" +
	"\n" +
	"am get-current-user: returns id of the current foreground user.\n" +
	"\n"
	);
	Intent.printIntentArgsHelp(pw, "");
	pw.flush();
	}		}

	@Override		@Override
	@@ -385,9 +122,7 @@ public class Am extends BaseCommand {

	String op = nextArgRequired();		String op = nextArgRequired();

	if (op.equals("broadcast")) {		if (op.equals("instrument")) {
	sendBroadcast();
	} else if (op.equals("instrument")) {
	runInstrument();		runInstrument();
	} else {		} else {
	runAmCmd(getRawArgs());		runAmCmd(getRawArgs());
	@@ -458,90 +193,6 @@ public class Am extends BaseCommand {
	}		}
	}		}

	private Intent makeIntent(int defUser) throws URISyntaxException {
	mStartFlags = 0;
	mWaitOption = false;
	mStopOption = false;
	mRepeat = 0;
	mProfileFile = null;
	mSamplingInterval = 0;
	mAutoStop = false;
	mUserId = defUser;
	mStackId = INVALID_STACK_ID;

	return Intent.parseCommandArgs(mArgs, new Intent.CommandOptionHandler() {
	@Override
	public boolean handleOption(String opt, ShellCommand cmd) {
	if (opt.equals("-D")) {
	mStartFlags \|= ActivityManager.START_FLAG_DEBUG;
	} else if (opt.equals("-N")) {
	mStartFlags \|= ActivityManager.START_FLAG_NATIVE_DEBUGGING;
	} else if (opt.equals("-W")) {
	mWaitOption = true;
	} else if (opt.equals("-P")) {
	mProfileFile = nextArgRequired();
	mAutoStop = true;
	} else if (opt.equals("--start-profiler")) {
	mProfileFile = nextArgRequired();
	mAutoStop = false;
	} else if (opt.equals("--sampling")) {
	mSamplingInterval = Integer.parseInt(nextArgRequired());
	} else if (opt.equals("-R")) {
	mRepeat = Integer.parseInt(nextArgRequired());
	} else if (opt.equals("-S")) {
	mStopOption = true;
	} else if (opt.equals("--track-allocation")) {
	mStartFlags \|= ActivityManager.START_FLAG_TRACK_ALLOCATION;
	} else if (opt.equals("--user")) {
	mUserId = UserHandle.parseUserArg(nextArgRequired());
	} else if (opt.equals("--receiver-permission")) {
	mReceiverPermission = nextArgRequired();
	} else if (opt.equals("--stack")) {
	mStackId = Integer.parseInt(nextArgRequired());
	} else {
	return false;
	}
	return true;
	}
	});
	}

	private class IntentReceiver extends IIntentReceiver.Stub {
	private boolean mFinished = false;

	@Override
	public void performReceive(Intent intent, int resultCode, String data, Bundle extras,
	boolean ordered, boolean sticky, int sendingUser) {
	String line = "Broadcast completed: result=" + resultCode;
	if (data != null) line = line + ", data=\"" + data + "\"";
	if (extras != null) line = line + ", extras: " + extras;
	System.out.println(line);
	synchronized (this) {
	mFinished = true;
	notifyAll();
	}
	}

	public synchronized void waitForFinish() {
	try {
	while (!mFinished) wait();
	} catch (InterruptedException e) {
	throw new IllegalStateException(e);
	}
	}
	}

	private void sendBroadcast() throws Exception {
	Intent intent = makeIntent(UserHandle.USER_CURRENT);
	IntentReceiver receiver = new IntentReceiver();
	String[] requiredPermissions = mReceiverPermission == null ? null
	: new String[] {mReceiverPermission};
	System.out.println("Broadcasting: " + intent);
	mAm.broadcastIntent(null, intent, null, receiver, 0, null, null, requiredPermissions,
	android.app.AppOpsManager.OP_NONE, null, true, false, mUserId);
	receiver.waitForFinish();
	}

	public void runInstrument() throws Exception {		public void runInstrument() throws Exception {
	Instrument instrument = new Instrument(mAm, mPm);		Instrument instrument = new Instrument(mAm, mPm);

cmds/appops/appops

+2 −1

Original line number	Original line	Diff line number	Diff line
	cmd appops $@		#!/system/bin/sh
			cmd appops "$@"