diff options
| author | Tao Bao <tbao@google.com> | 2019-04-07 23:24:03 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2019-04-26 12:27:17 -0700 |
| commit | 25fe126fb0bb60f00e9aeb0c16123179976f63ae (patch) | |
| tree | 705c45256fa82dc4e212170cbb35a3b1e8925757 /adb/client/commandline.cpp | |
| parent | ff9ac9e2869b105de3a972d5cff1becc9443fcde (diff) | |
| download | system_core-25fe126fb0bb60f00e9aeb0c16123179976f63ae.tar.gz system_core-25fe126fb0bb60f00e9aeb0c16123179976f63ae.tar.bz2 system_core-25fe126fb0bb60f00e9aeb0c16123179976f63ae.zip | |
adb: Recognize rescue mode.
This CL adds client support to recognize the rescue mode (which will be
served by recovery image). It also allows waiting for a device to enter
rescue mode. The support for the actual rescue commands will be added in
follow-up CLs.
Bug: 128415917
Test: `adb devices` recognizes devices under rescue mode.
Test: `adb wait-for-rescue` waits for device to be in rescue mode.
Change-Id: I367d7339fe68006aba09a1e3db6370d472296676
Merged-In: I367d7339fe68006aba09a1e3db6370d472296676
(cherry picked from commit 55d407ec4a0b23f1e20db298b4989068a820087f)
Diffstat (limited to 'adb/client/commandline.cpp')
| -rw-r--r-- | adb/client/commandline.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp index 43a3e5e94..f25955d85 100644 --- a/adb/client/commandline.cpp +++ b/adb/client/commandline.cpp @@ -190,7 +190,7 @@ static void help() { "scripting:\n" " wait-for[-TRANSPORT]-STATE\n" " wait for device to be in the given state\n" - " STATE: device, recovery, sideload, bootloader, or disconnect\n" + " STATE: device, recovery, rescue, sideload, bootloader, or disconnect\n" " TRANSPORT: usb, local, or any [default=any]\n" " get-state print offline | bootloader | device\n" " get-serialno print <serial-number>\n" @@ -1037,11 +1037,12 @@ static bool wait_for_device(const char* service, } if (components[3] != "any" && components[3] != "bootloader" && components[3] != "device" && - components[3] != "recovery" && components[3] != "sideload" && + components[3] != "recovery" && components[3] != "rescue" && components[3] != "sideload" && components[3] != "disconnect") { fprintf(stderr, "adb: unknown state %s; " - "expected 'any', 'bootloader', 'device', 'recovery', 'sideload', or 'disconnect'\n", + "expected 'any', 'bootloader', 'device', 'recovery', 'rescue', 'sideload', or " + "'disconnect'\n", components[3].c_str()); return false; } |