Merge change I305e1b8f into eclair-mr2 (b292461c) · Commits · e / os / android_frameworks_base

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

+14 −9

Original line number	Diff line number	Diff line
		@@ -126,6 +126,10 @@ public class Am {
		String value = nextArgRequired();
		intent.putExtra(key, value);
		hasIntentInfo = true;
		} else if (opt.equals("--esn")) {
		String key = nextArgRequired();
		intent.putExtra(key, (String) null);
		hasIntentInfo = true;
		} else if (opt.equals("--ei")) {
		String key = nextArgRequired();
		String value = nextArgRequired();
		@@ -507,6 +511,7 @@ public class Am {
		" [-a <ACTION>] [-d <DATA_URI>] [-t <MIME_TYPE>]\n" +
		" [-c <CATEGORY> [-c <CATEGORY>] ...]\n" +
		" [-e\|--es <EXTRA_KEY> <EXTRA_STRING_VALUE> ...]\n" +
		" [--esn <EXTRA_KEY> ...]\n" +
		" [--ez <EXTRA_KEY> <EXTRA_BOOLEAN_VALUE> ...]\n" +
		" [-e\|--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]\n" +
		" [-n <COMPONENT>] [-f <FLAGS>] [<URI>]\n"