Index: build/android/devil/utils/lsusb.py |
diff --git a/build/android/devil/utils/lsusb.py b/build/android/devil/utils/lsusb.py |
index 37bf4f2789a6910dff3dc417dcff402d242a8c7b..5790a0de4d5f2f37d7778b7274e2a34db8e38460 100644 |
--- a/build/android/devil/utils/lsusb.py |
+++ b/build/android/devil/utils/lsusb.py |
@@ -87,7 +87,12 @@ def lsusb(): |
if m: |
bus_num = m.group(1) |
dev_num = m.group(2) |
- devices.append(_lsusbv_on_device(bus_num, dev_num)) |
+ try: |
+ devices.append(_lsusbv_on_device(bus_num, dev_num)) |
+ except cmd_helper.TimeoutError: |
+ # Will be blacklisted if it is in expected device file, but times out. |
+ logging.info('lsusb -v %s:%s timed out.', bus_num, dev_num) |
+ |
return devices |
def get_lsusb_serial(device): |