Index: build/android/pylib/forwarder.py |
diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py |
index aec572c9d42c0720882381101d83489877a6d61e..4f067def0daa4180570b22f271c02e67d2145694 100644 |
--- a/build/android/pylib/forwarder.py |
+++ b/build/android/pylib/forwarder.py |
@@ -340,8 +340,8 @@ class Forwarder(object): |
# sure that the old version of device_forwarder (not supporting |
# 'kill-server') is not running on the bots anymore. |
timeout_sec = 5 |
- processes_killed = device.old_interface.KillAllBlocking( |
- 'device_forwarder', timeout_sec) |
+ processes_killed = device.KillAll( |
+ 'device_forwarder', blocking=True, timeout=timeout_sec) |
if not processes_killed: |
pids = device.old_interface.ExtractPid('device_forwarder') |
if pids: |