diff options
| author | Josh Gao <jmgao@google.com> | 2016-04-13 12:22:27 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2016-04-13 12:28:04 -0700 |
| commit | 48a348183f5f4478ca5b0ca2059fa829648fc090 (patch) | |
| tree | a623a7ec3c68445c6a561d9a50bf98844ca5e750 /adb/commandline.cpp | |
| parent | 86441c31fe256f37625743e2818377ce5e3dec05 (diff) | |
| download | core-48a348183f5f4478ca5b0ca2059fa829648fc090.tar.gz core-48a348183f5f4478ca5b0ca2059fa829648fc090.tar.bz2 core-48a348183f5f4478ca5b0ca2059fa829648fc090.zip | |
adb: after `adb root`, wait for the device in any state.
Otherwise, `adb root` while the device is in recovery will hang.
Bug: http://b/28168212
Change-Id: Ibc8038b1745139fb505e466c74c605b9df474c8c
Diffstat (limited to 'adb/commandline.cpp')
| -rw-r--r-- | adb/commandline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/commandline.cpp b/adb/commandline.cpp index 6c3a1a5ba..f5d13c3fc 100644 --- a/adb/commandline.cpp +++ b/adb/commandline.cpp @@ -1104,7 +1104,7 @@ static bool adb_root(const char* command) { TransportType type; const char* serial; adb_get_transport(&type, &serial); - return wait_for_device("wait-for-device", type, serial); + return wait_for_device("wait-for-any", type, serial); } // Connects to the device "shell" service with |command| and prints the |