Merge \\"adb: make adb root not wait-for-device.\\" am: 81e59ca5a7
am: ba7aea829b
Change-Id: I9c2a95c51aa40e61180e87df84d77db258bffb81
diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 084985a..46a6365 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1107,12 +1107,10 @@
return true;
}
- // Give adbd 500ms to kill itself, then wait-for-device for it to come back up.
- adb_sleep_ms(500);
- TransportType type;
- const char* serial;
- adb_get_transport(&type, &serial);
- return wait_for_device("wait-for-any", type, serial);
+ // Give adbd some time to kill itself and come back up.
+ // We can't use wait-for-device because devices (e.g. adb over network) might not come back.
+ adb_sleep_ms(3000);
+ return true;
}
// Connects to the device "shell" service with |command| and prints the