| 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..a3f5aa74009fc0dcc7369f0fe0129889f4dd323f 100644
|
| --- a/telemetry/telemetry/internal/platform/android_platform_backend.py
|
| +++ b/telemetry/telemetry/internal/platform/android_platform_backend.py
|
| @@ -484,9 +484,14 @@ 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('ADB forwarder list output format unexpected. Expected '
|
| + 'format "<device id> tcp:<host port> but got:\n%s',
|
| + line)
|
| else:
|
| logging.warning('Port %s not found in adb forward --list for device %s',
|
| host_port, self._device)
|
|
|