diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-02 21:40:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-02 21:40:39 -0700 |
| commit | e991decf340e24203ed63f87d9313598cd09a46c (patch) | |
| tree | 96aedf7312f8d83a02b4f5b1e1ee0735d896e722 /adb/commandline.c | |
| parent | 69551d85e95d2ba712f083b39f3ff0b32f865e34 (diff) | |
| parent | abe3a9c30595846b7e3d705dd4b0aca37fb2f748 (diff) | |
| download | system_core-e991decf340e24203ed63f87d9313598cd09a46c.zip system_core-e991decf340e24203ed63f87d9313598cd09a46c.tar.gz system_core-e991decf340e24203ed63f87d9313598cd09a46c.tar.bz2 | |
Merge changes 23694,23695,23696 into eclair
* changes:
init.rc: Add dumpstate service
init: Add support for enforcing setprop by caller's group.
adb: "adb bugreport" now runs dumpstate via init rather than execing it in the shell.
Diffstat (limited to 'adb/commandline.c')
| -rw-r--r-- | adb/commandline.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/adb/commandline.c b/adb/commandline.c index 411bb82..6603452 100644 --- a/adb/commandline.c +++ b/adb/commandline.c @@ -929,7 +929,7 @@ top: if(!strcmp(argv[0], "remount") || !strcmp(argv[0], "reboot") || !strcmp(argv[0], "tcpip") || !strcmp(argv[0], "usb") - || !strcmp(argv[0], "root")) { + || !strcmp(argv[0], "root") || !strcmp(argv[0], "bugreport")) { char command[100]; if (argc > 1) snprintf(command, sizeof(command), "%s:%s", argv[0], argv[1]); @@ -945,14 +945,6 @@ top: return 1; } - if(!strcmp(argv[0], "bugreport")) { - if (argc != 1) { - return 1; - } - do_cmd(ttype, serial, "shell", "dumpstate", "-", 0); - return 0; - } - /* adb_command() wrapper commands */ if(!strncmp(argv[0], "wait-for-", strlen("wait-for-"))) { |