Index: tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
index 3677f0119b6fbfac6a7cb9efe205f9074963f7d4..d80614c490905b879e1f8a35be5b635ee29b9773 100644 |
--- a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py |
@@ -163,7 +163,10 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend): |
# Kill old browser. |
self._adb.CloseApplication(self._backend_settings.package) |
- self._adb.KillAll('device_forwarder') |
+ |
+ adb_commands.Forwarder.KillDevice(self._adb) |
+ if not options.keep_test_server_ports: |
+ adb_commands.Forwarder.KillHost() |
if self._adb.Adb().CanAccessProtectedFileContents(): |
if not options.dont_override_profile: |