summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Egnor <egnor@google.com>2010-01-20 13:50:36 -0800
committerDan Egnor <egnor@google.com>2010-01-20 13:52:59 -0800
commitc130ea7c29b0149939c8fd6b8da2c981944636f9 (patch)
tree882ff4ef141de3e813698e9e1d7779118325c0e8
parenteb4ae9c6c353e1bb7a45ad971638387521e0c713 (diff)
downloadsystem_core-c130ea7c29b0149939c8fd6b8da2c981944636f9.zip
system_core-c130ea7c29b0149939c8fd6b8da2c981944636f9.tar.gz
system_core-c130ea7c29b0149939c8fd6b8da2c981944636f9.tar.bz2
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.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/adb/commandline.c b/adb/commandline.c
index b96674f..5756752 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;
}