From adb81c8ebd0a0236f8e4c7d8d52b9601c52e4144 Mon Sep 17 00:00:00 2001 From: wuhu Date: Tue, 11 Nov 2014 09:50:53 -0800 Subject: [PATCH] Handle forwarder exception introduced by change to adb_wrapper.py that retrieves and checks adb command exit code. This will fail if the adb command causes USB connection to be reset. BUG= Review URL: https://codereview.chromium.org/688253003 Cr-Commit-Position: refs/heads/master@{#303671} --- tools/telemetry/telemetry/core/forwarders/android_forwarder.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py index 589d2ecb8b52..e28bb546df65 100644 --- a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py +++ b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py @@ -18,6 +18,7 @@ from telemetry.util import support_binaries util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android') try: from pylib import forwarder # pylint: disable=F0401 + from pylib.device import device_errors # pylint: disable=F0401 except Exception: forwarder = None @@ -251,7 +252,11 @@ class AndroidRndisConfigurator(object): ['/usr/bin/sudo', 'installer', '-pkg', pkg_path, '-target', '/']) def _DisableRndis(self): - self._device.SetProp('sys.usb.config', 'adb') + try: + self._device.SetProp('sys.usb.config', 'adb') + except device_errors.AdbCommandFailedError: + # Ignore exception due to USB connection being reset. + pass self._WaitForDevice() def _EnableRndis(self): -- 2.11.4.GIT