Index: build/android/buildbot/bb_device_steps.py |
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py |
index 32438ae8fc47479a96b2d6d96e35ae133528cfc6..df6ae432c0a6b54d4e27b9803e60026cedc3cdad 100755 |
--- a/build/android/buildbot/bb_device_steps.py |
+++ b/build/android/buildbot/bb_device_steps.py |
@@ -237,12 +237,13 @@ def SpawnLogcatMonitor(): |
RunCmd(['sleep', '5']) |
def ProvisionDevices(options): |
+ bb_annotations.PrintNamedStep('provision_devices') |
+ |
# Restart adb to work around bugs, sleep to wait for usb discovery. |
- RunCmd(['adb', 'kill-server']) |
- RunCmd(['adb', 'start-server']) |
+ adb = android_commands.AndroidCommands() |
+ adb.RestartAdbServer() |
RunCmd(['sleep', '1']) |
- bb_annotations.PrintNamedStep('provision_devices') |
if options.reboot: |
RebootDevices() |
provision_cmd = ['build/android/provision_devices.py', '-t', options.target] |