summaryrefslogtreecommitdiffstats
path: root/adb/client/commandline.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-06-04 14:37:06 -0700
committerTao Bao <tbao@google.com>2019-06-06 09:10:22 -0700
commite6827e5e870b4eb366deebb4d5963afa71ea2add (patch)
tree476b97403219a5459d7b1c2124ecc04323f8360e /adb/client/commandline.cpp
parent857a861c182c86c0f1d61e813ba63b8b95e9bc12 (diff)
downloadsystem_core-e6827e5e870b4eb366deebb4d5963afa71ea2add.tar.gz
system_core-e6827e5e870b4eb366deebb4d5963afa71ea2add.tar.bz2
system_core-e6827e5e870b4eb366deebb4d5963afa71ea2add.zip
adb: Allow `adb rescue getprop`.
Which will dump all the allowed properties, similar to `adb shell getprop`. Bug: 134027350 Test: Run the command under rescue mode. Change-Id: Id668224098006d71ee192c8c2bea5d791d2423c1 (cherry picked from commit 599eee1f3759bb9b1473b1bf2f46fb4ee1896fe2)
Diffstat (limited to 'adb/client/commandline.cpp')
-rw-r--r--adb/client/commandline.cpp18
1 files changed, 15 insertions, 3 deletions
diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index e2a17c553..8dd85d7b0 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -1668,17 +1668,29 @@ int adb_commandline(int argc, const char** argv) {
return 0;
}
} else if (!strcmp(argv[0], "rescue")) {
+ // adb rescue getprop
// adb rescue getprop <prop>
// adb rescue install <filename>
// adb rescue wipe userdata
- if (argc != 3) error_exit("rescue requires two arguments");
+ if (argc < 2) error_exit("rescue requires at least one argument");
if (!strcmp(argv[1], "getprop")) {
- return adb_connect_command(android::base::StringPrintf("rescue-getprop:%s", argv[2]));
+ if (argc == 2) {
+ return adb_connect_command("rescue-getprop:");
+ }
+ if (argc == 3) {
+ return adb_connect_command(
+ android::base::StringPrintf("rescue-getprop:%s", argv[2]));
+ }
+ error_exit("invalid rescue getprop arguments");
} else if (!strcmp(argv[1], "install")) {
+ if (argc != 3) error_exit("rescue install requires two arguments");
if (adb_sideload_install(argv[2], true /* rescue_mode */) != 0) {
return 1;
}
- } else if (!strcmp(argv[1], "wipe") && !strcmp(argv[2], "userdata")) {
+ } else if (!strcmp(argv[1], "wipe")) {
+ if (argc != 3 || strcmp(argv[2], "userdata") != 0) {
+ error_exit("invalid rescue wipe arguments");
+ }
return adb_wipe_devices();
} else {
error_exit("invalid rescue argument");