Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b292461c: Merge change I305e1b8f into eclair-mr2

Browse Source 
Merge commit 'b292461c6791b6e6780085358a5ba15f688e70ba' into eclair-mr2-plus-aosp

* commit 'b292461c6791b6e6780085358a5ba15f688e70ba':
  add --esn option to am to allow adding extra with a null value
This commit is contained in:
Doug Zongker
2009-11-30 16:27:56 -08:00
committed by Android Git Automerger
parent 15740edd2a b292461c67
commit bf72820e77
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmds/am/src/com/android/commands/am/Am.java
View File

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