Index: devil/devil/android/tools/device_recovery.py |
diff --git a/devil/devil/android/tools/device_recovery.py b/devil/devil/android/tools/device_recovery.py |
index ae64b511efe78ee8670e96ba565478f97ae85c4e..3b0f756744175aa18ca2f0c7ed9773a83594ba41 100755 |
--- a/devil/devil/android/tools/device_recovery.py |
+++ b/devil/devil/android/tools/device_recovery.py |
@@ -22,7 +22,6 @@ from devil.android import device_errors |
from devil.android import device_utils |
from devil.android.tools import device_status |
from devil.utils import lsusb |
-from devil.utils import reset_usb |
from devil.utils import run_tests_helper |
@@ -140,7 +139,10 @@ def RecoverDevices(devices, blacklist): |
KillAllAdb() |
for serial in should_restart_usb: |
try: |
- reset_usb.reset_android_usb(serial) |
+ # TODO(crbug.com/642194): Resetting may be causing more harm |
+ # (specifically, kernel panics) than it does good. |
+ logging.warning('USB reset disabled for %s (crbug.com/642914)', |
+ serial) |
except IOError: |
logging.exception('Unable to reset USB for %s.', serial) |
if blacklist: |