tools/telemetry/telemetry/core/chrome/android_browser_backend.py - Issue 18781002: Revert "Improve forwarder2 setup/tear down in telemetry."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/chrome/android_browser_backend.py

Issue 18781002: Revert "Improve forwarder2 setup/tear down in telemetry." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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 d80614c490905b879e1f8a35be5b635ee29b9773..3677f0119b6fbfac6a7cb9efe205f9074963f7d4 100644

--- a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py

+++ b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py

@@ -163,10 +163,7 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):

# Kill old browser.

self._adb.CloseApplication(self._backend_settings.package)

- adb_commands.Forwarder.KillDevice(self._adb)

- if not options.keep_test_server_ports:

- adb_commands.Forwarder.KillHost()

+ self._adb.KillAll('device_forwarder')

if self._adb.Adb().CanAccessProtectedFileContents():

if not options.dont_override_profile:

« no previous file with comments | « tools/telemetry/telemetry/core/chrome/adb_commands.py ('k') | no next file » | no next file with comments »