diff options
| author | Dan Egnor <egnor@google.com> | 2010-01-21 17:10:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-21 17:10:50 -0800 |
| commit | 288c7cfe1b702dc669a8c4b7094035efc1cf7e30 (patch) | |
| tree | 03acda1368026c1cff2c0e8a38970ef8f548fb1b | |
| parent | 25eab084c5bc6b6ed68001b4f67ca405fc541fcb (diff) | |
| parent | c130ea7c29b0149939c8fd6b8da2c981944636f9 (diff) | |
| download | system_core-288c7cfe1b702dc669a8c4b7094035efc1cf7e30.tar.gz system_core-288c7cfe1b702dc669a8c4b7094035efc1cf7e30.tar.bz2 system_core-288c7cfe1b702dc669a8c4b7094035efc1cf7e30.zip | |
Merge "make "adb bugreport" run "bugreport" (which invokes "dumpstate" indirectly via system service) rather than "dumpstate", that way even when adb is not running as root, dumpstate does run as root, and can do things like collect VM traces."
| -rw-r--r-- | adb/commandline.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index b96674fa..57567524 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -951,10 +951,8 @@ top: } if(!strcmp(argv[0], "bugreport")) { - if (argc != 1) { - return 1; - } - do_cmd(ttype, serial, "shell", "dumpstate", "-", 0); + if (argc != 1) return usage(); + do_cmd(ttype, serial, "shell", "bugreport", 0); return 0; } |