Index: build/android/pylib/forwarder.py |
diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py |
index f4fb65003bddb37a242889f41e0c8bdaa77dd913..de048422f820bf0f03f7d4b4c90489586996e29d 100644 |
--- a/build/android/pylib/forwarder.py |
+++ b/build/android/pylib/forwarder.py |
@@ -141,6 +141,9 @@ class Forwarder(object): |
device: A DeviceUtils instance. |
port_pairs: A list of tuples (device_port, host_port) to unmap. |
""" |
+ # TODO(jbudorick) Remove once telemetry gets switched over. |
+ if isinstance(device, pylib.android_commands.AndroidCommands): |
+ device = pylib.device.device_utils.DeviceUtils(device) |
with _FileLock(Forwarder._LOCK_PATH): |
if not Forwarder._instance: |
return |