Chromium Code Reviews| Index: telemetry/telemetry/internal/platform/android_platform_backend.py |
| diff --git a/telemetry/telemetry/internal/platform/android_platform_backend.py b/telemetry/telemetry/internal/platform/android_platform_backend.py |
| index 3b57f66779275d245392320e15b66ce60fb323f7..b625bfee29005bf635499940af4109a4d11022c6 100644 |
| --- a/telemetry/telemetry/internal/platform/android_platform_backend.py |
| +++ b/telemetry/telemetry/internal/platform/android_platform_backend.py |
| @@ -484,9 +484,13 @@ class AndroidPlatformBackend( |
| def StopForwardingHost(self, host_port): |
| for line in self._device.adb.ForwardList().strip().splitlines(): |
| line = line.split(' ') |
| - if line[0] == self._device and line[1] == 'tcp:%s' % host_port: |
| - self._device.adb.ForwardRemove('tcp:%d' % host_port) |
| - break |
| + if len(line) >= 2: |
| + if line[0] == self._device and line[1] == 'tcp:%s' % host_port: |
| + self._device.adb.ForwardRemove('tcp:%d' % host_port) |
| + break |
| + else: |
| + logging.warning('Attempted to split line in StopForwardingHost method, ' |
| + 'but outcome was unexpected:\n%s' % line) |
|
mikecase (-- gone --)
2016/10/14 16:58:13
nit: I would reword this error message to somethin
rnephew (Reviews Here)
2016/10/14 17:06:41
Done.
|
| else: |
| logging.warning('Port %s not found in adb forward --list for device %s', |
| host_port, self._device) |