Merge "Small cleanup of am/pm commands." (7cec1423) · Commits · e / os / android_frameworks_base

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

+120 −53

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.os.Bundle;
		import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemProperties;
		import android.util.AndroidException;
		import android.view.IWindowManager;

		@@ -199,6 +200,10 @@ public class Am {
		intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
		} else if (opt.equals("--grant-write-uri-permission")) {
		intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
		} else if (opt.equals("--exclude-stopped-packages")) {
		intent.addFlags(Intent.FLAG_EXCLUDE_STOPPED_PACKAGES);
		} else if (opt.equals("--include-stopped-packages")) {
		intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
		} else if (opt.equals("--debug-log-resolution")) {
		intent.addFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION);
		} else if (opt.equals("--activity-brought-to-front")) {
		@@ -227,6 +232,10 @@ public class Am {
		intent.addFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
		} else if (opt.equals("--activity-single-top")) {
		intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
		} else if (opt.equals("--activity-clear-task")) {
		intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
		} else if (opt.equals("--activity-task-on-home")) {
		intent.addFlags(Intent.FLAG_ACTIVITY_TASK_ON_HOME);
		} else if (opt.equals("--receiver-registered-only")) {
		intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
		} else if (opt.equals("--receiver-replace-pending")) {
		@@ -400,7 +409,8 @@ public class Am {
		argKey = nextArgRequired();
		argValue = nextArgRequired();
		args.putString(argKey, argValue);
		} else if (opt.equals("--no_window_animation")) {
		} else if (opt.equals("--no_window_animation")
		\|\| opt.equals("--no-window-animation")) {
		no_window_animation = true;
		} else {
		System.err.println("Error: Unknown option: " + opt);
		@@ -440,15 +450,43 @@ public class Am {
		}
		}

		static void removeWallOption() {
		String props = SystemProperties.get("dalvik.vm.extra-opts");
		if (props != null && props.contains("-Xprofile:wallclock")) {
		props = props.replace("-Xprofile:wallclock", "");
		props = props.trim();
		SystemProperties.set("dalvik.vm.extra-opts", props);
		}
		}

		private void runProfile() throws Exception {
		String profileFile = null;
		boolean start = false;
		String process = nextArgRequired();
		ParcelFileDescriptor fd = null;
		boolean wall = false;

		String process = null;

		String cmd = nextArgRequired();
		if ("start".equals(cmd)) {
		start = true;
		wall = "--wall".equals(nextOption());
		process = nextArgRequired();
		} else if ("stop".equals(cmd)) {
		process = nextArgRequired();
		} else {
		// Compatibility with old syntax: process is specified first.
		process = cmd;
		cmd = nextArgRequired();
		if ("start".equals(cmd)) {
		start = true;
		} else if (!"stop".equals(cmd)) {
		throw new IllegalArgumentException("Profile command " + process + " not valid");
		}
		}

		ParcelFileDescriptor fd = null;

		if (start) {
		profileFile = nextArgRequired();
		try {
		fd = ParcelFileDescriptor.open(
		@@ -460,13 +498,28 @@ public class Am {
		System.err.println("Error: Unable to open file: " + profileFile);
		return;
		}
		} else if (!"stop".equals(cmd)) {
		throw new IllegalArgumentException("Profile command " + cmd + " not valid");
		}

		try {
		if (wall) {
		// XXX doesn't work -- this needs to be set before booting.
		String props = SystemProperties.get("dalvik.vm.extra-opts");
		if (props == null \|\| !props.contains("-Xprofile:wallclock")) {
		props = props + " -Xprofile:wallclock";
		//SystemProperties.set("dalvik.vm.extra-opts", props);
		}
		} else if (start) {
		//removeWallOption();
		}
		if (!mAm.profileControl(process, start, profileFile, fd)) {
		wall = false;
		throw new AndroidException("PROFILE FAILED on process " + process);
		}
		} finally {
		if (!wall) {
		//removeWallOption();
		}
		}
		}

		private void runDumpHeap() throws Exception {
		@@ -1012,41 +1065,53 @@ public class Am {
		private static void showUsage() {
		System.err.println(
		"usage: am [subcommand] [options]\n" +
		"usage: am start [-D] [-W] <INTENT>\n" +
		" am startservice <INTENT>\n" +
		" am force-stop <PACKAGE>\n" +
		" am broadcast <INTENT>\n" +
		" am instrument [-r] [-e <NAME> <VALUE>] [-p] [-w]\n" +
		" [--no-window-animation] <COMPONENT>\n" +
		" am profile start <PROCESS> <FILE>\n" +
		" am profile stop <PROCESS>\n" +
		" am dumpheap [flags] <PROCESS> <FILE>\n" +
		" am monitor [--gdb <port>]\n" +
		" am screen-compat [on\|off] <PACKAGE>\n" +
		" am display-size [reset\|MxN]\n" +
		"\n" +
		" start an Activity: am start [-D] [-W] <INTENT>\n" +
		"am start: start an Activity. Options are:\n" +
		" -D: enable debugging\n" +
		" -W: wait for launch to complete\n" +
		"\n" +
		" start a Service: am startservice <INTENT>\n" +
		"am startservice: start a Service.\n" +
		"\n" +
		" force stop everything associated with a package: force-stop <package>\n" +
		"am force-stop: force stop everything associated with <PACKAGE>.\n" +
		"\n" +
		" send a broadcast Intent: am broadcast <INTENT>\n" +
		"am broadcast: send a broadcast Intent.\n" +
		"\n" +
		" start an Instrumentation: am instrument [flags] <COMPONENT>\n" +
		" -r: print raw results (otherwise decode REPORT_KEY_STREAMRESULT)\n" +
		" -e <NAME> <VALUE>: set argument <NAME> to <VALUE>\n" +
		"am instrument: start an Instrumentation. Typically this target <COMPONENT>\n" +
		" is the form <TEST_PACKAGE>/<RUNNER_CLASS>. 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" +
		" -w: wait for instrumentation to finish before returning\n" +
		" -w: wait for instrumentation to finish before returning. Required for\n" +
		" test runners.\n" +
		" --no-window-animation: turn off window animations will running.\n" +
		"\n" +
		" run a test package against an application: am instrument [flags] <TEST_PACKAGE>/<RUNNER_CLASS>\n" +
		" -e <testrunner_flag> <testrunner_value> [,<testrunner_value>]\n" +
		" -w wait for the test to finish (required)\n" +
		" -r use with -e perf true to generate raw output for performance measurements\n" +
		"am profile: start and stop profiler on a process.\n" +
		"\n" +
		" start profiling: am profile <PROCESS> start <FILE>\n" +
		" stop profiling: am profile <PROCESS> stop\n" +
		" dump heap: am dumpheap [flags] <PROCESS> <FILE>\n" +
		"am dumpheap: dump the heap of a process. Options are:\n" +
		" -n: dump native heap instead of managed heap\n" +
		"\n" +
		" start monitoring: am monitor [--gdb <port>]\n" +
		"am monitor: start monitoring for crashes or ANRs.\n" +
		" --gdb: start gdbserv on the given port at crash/ANR\n" +
		"\n" +
		" control screen compatibility: am screen-compat [on\|off] [package]\n" +
		"am screen-compat: control screen compatibility mode of <PACKAGE>.\n" +
		"\n" +
		" override display size: am display-size [reset\|MxN]\n" +
		"am display-size: override display size.\n" +
		"\n" +
		" <INTENT> specifications include these flags:\n" +
		"<INTENT> specifications include these flags and arguments:\n" +
		" [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" +
		" [-c <CATEGORY> [-c <CATEGORY>] ...]\n" +
		" [-e\|--es <EXTRA_KEY> <EXTRA_STRING_VALUE> ...]\n" +
		@@ -1058,14 +1123,16 @@ public class Am {
		" [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" +
		" [-n <COMPONENT>] [-f <FLAGS>]\n" +
		" [--grant-read-uri-permission] [--grant-write-uri-permission]\n" +
		" [--debug-log-resolution]\n" +
		" [--debug-log-resolution] [--exclude-stopped-packages]\n" +
		" [--include-stopped-packages]\n" +
		" [--activity-brought-to-front] [--activity-clear-top]\n" +
		" [--activity-clear-when-task-reset] [--activity-exclude-from-recents]\n" +
		" [--activity-launched-from-history] [--activity-multiple-task]\n" +
		" [--activity-no-animation] [--activity-no-history]\n" +
		" [--activity-no-user-action] [--activity-previous-is-top]\n" +
		" [--activity-reorder-to-front] [--activity-reset-task-if-needed]\n" +
		" [--activity-single-top]\n" +
		" [--activity-single-top] [--activity-clear-task]\n" +
		" [--activity-task-on-home]\n" +
		" [--receiver-registered-only] [--receiver-replace-pending]\n" +
		" [<URI>]\n"
		);

cmds/pm/src/com/android/commands/pm/Pm.java

+50 −51

Original line number	Diff line number	Diff line
		@@ -125,12 +125,12 @@ public final class Pm {
		return;
		}

		if ("setInstallLocation".equals(op)) {
		if ("set-install-location".equals(op)) {
		runSetInstallLocation();
		return;
		}

		if ("getInstallLocation".equals(op)) {
		if ("get-install-location".equals(op)) {
		runGetInstallLocation();
		return;
		}
		@@ -1094,8 +1094,7 @@ public final class Pm {
		}

		private static void showUsage() {
		System.err.println("usage: pm [list\|path\|install\|uninstall]");
		System.err.println(" pm list packages [-f] [-d] [-e] [-s] [-e] [-u] [FILTER]");
		System.err.println("usage: pm list packages [-f] [-d] [-e] [-s] [-e] [-u] [FILTER]");
		System.err.println(" pm list permission-groups");
		System.err.println(" pm list permissions [-g] [-f] [-d] [-u] [GROUP]");
		System.err.println(" pm list instrumentation [-f] [TARGET-PACKAGE]");
		@@ -1107,11 +1106,13 @@ public final class Pm {
		System.err.println(" pm clear PACKAGE");
		System.err.println(" pm enable PACKAGE_OR_COMPONENT");
		System.err.println(" pm disable PACKAGE_OR_COMPONENT");
		System.err.println(" pm setInstallLocation [0/auto] [1/internal] [2/external]");
		System.err.println(" pm disable-user PACKAGE_OR_COMPONENT");
		System.err.println(" pm set-install-location [0/auto] [1/internal] [2/external]");
		System.err.println(" pm get-install-location");
		System.err.println(" pm createUser USER_NAME");
		System.err.println(" pm removeUser USER_ID");
		System.err.println("");
		System.err.println("The list packages command prints all packages, optionally only");
		System.err.println("pm list packages: prints all packages, optionally only");
		System.err.println(" those whose package name contains the text in FILTER. Options:");
		System.err.println(" -f: see their associated file.");
		System.err.println(" -d: filter to only show disbled packages.");
		@@ -1120,29 +1121,26 @@ public final class Pm {
		System.err.println(" -3: filter to only show third party packages.");
		System.err.println(" -u: also include uninstalled packages.");
		System.err.println("");
		System.err.println("The list permission-groups command prints all known");
		System.err.println("permission groups.");
		System.err.println("pm list permission-groups: prints all known permission groups.");
		System.err.println("");
		System.err.println("The list permissions command prints all known");
		System.err.println("permissions, optionally only those in GROUP. Options:");
		System.err.println("pm list permissions: prints all known permissions, optionally only");
		System.err.println(" those in GROUP. Options:");
		System.err.println(" -g: organize by group.");
		System.err.println(" -f: print all information.");
		System.err.println(" -s: short summary.");
		System.err.println(" -d: only list dangerous permissions.");
		System.err.println(" -u: list only the permissions users will see.");
		System.err.println("");
		System.err.println("The list instrumentation command prints all instrumentations,");
		System.err.println("or only those that target a specified package. Options:");
		System.err.println(" -f: see their associated file.");
		System.err.println("(Use this command to list all test packages, or use <TARGET-PACKAGE> ");
		System.err.println(" to list the test packages for a particular application. The -f ");
		System.err.println(" option lists the .apk file for the test package.)");
		System.err.println("pm list instrumentation: use to list all test packages; optionally");
		System.err.println(" supply <TARGET-PACKAGE> to list the test packages for a particular");
		System.err.println(" application. Options:");
		System.err.println(" -f: list the .apk file for the test package.");
		System.err.println("");
		System.err.println("The list features command prints all features of the system.");
		System.err.println("pm list features: prints all features of the system.");
		System.err.println("");
		System.err.println("The path command prints the path to the .apk of a package.");
		System.err.println("pm path: print the path to the .apk of the given PACKAGE.");
		System.err.println("");
		System.err.println("The install command installs a package to the system. Options:");
		System.err.println("pm install: installs a package to the system. Options:");
		System.err.println(" -l: install the package with FORWARD_LOCK.");
		System.err.println(" -r: reinstall an exisiting app, keeping its data.");
		System.err.println(" -t: allow test .apks to be installed.");
		@@ -1150,21 +1148,22 @@ public final class Pm {
		System.err.println(" -s: install package on sdcard.");
		System.err.println(" -f: install package on internal flash.");
		System.err.println("");
		System.err.println("The uninstall command removes a package from the system. Options:");
		System.err.println(" -k: keep the data and cache directories around.");
		System.err.println("after the package removal.");
		System.err.println("pm uninstall: removes a package from the system. Options:");
		System.err.println(" -k: keep the data and cache directories around after package removal.");
		System.err.println("");
		System.err.println("The clear command deletes all data associated with a package.");
		System.err.println("pm clear: deletes all data associated with a package.");
		System.err.println("");
		System.err.println("The enable and disable commands change the enabled state of");
		System.err.println("a given package or component (written as \"package/class\").");
		System.err.println("pm enable, disable, disable-user: these commands change the enabled state");
		System.err.println(" of a given package or component (written as \"package/class\").");
		System.err.println("");
		System.err.println("The getInstallLocation command gets the current install location");
		System.err.println("pm get-install-location: returns the current install location.");
		System.err.println(" 0 [auto]: Let system decide the best location");
		System.err.println(" 1 [internal]: Install on internal device storage");
		System.err.println(" 2 [external]: Install on external media");
		System.err.println("");
		System.err.println("The setInstallLocation command changes the default install location");
		System.err.println("pm set-install-location: changes the default install location.");
		System.err.println(" NOTE: this is only intended for debugging; using this can cause");
		System.err.println(" applications to break and other undersireable behavior.");
		System.err.println(" 0 [auto]: Let system decide the best location");
		System.err.println(" 1 [internal]: Install on internal device storage");
		System.err.println(" 2 [external]: Install on external media");