tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py - Issue 994583004: Revert of Set use_rndis_forwarder in platform backend.

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/backends/chrome/android_browser_finder.py

Issue 994583004: Revert of Set use_rndis_forwarder in platform backend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py ('k') | tools/telemetry/telemetry/core/backends/chrome/cros_browser_finder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

index 4525bda8b4a43e22c3934ebbb84c66297fb59d58..348d1354c7f97c748065a16b509715f6f9e48bef 100644

--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_finder.py

@@ -103,9 +103,14 @@

def Create(self, finder_options):

self._InitPlatformIfNeeded()

+ use_rndis_forwarder = (finder_options.android_rndis or

+ finder_options.browser_options.netsim or

+ platform.GetHostPlatform().GetOSName() != 'linux')

browser_backend = android_browser_backend.AndroidBrowserBackend(

self._platform_backend,

finder_options.browser_options, self._backend_settings,

+ use_rndis_forwarder,

output_profile_path=finder_options.output_profile_path,

extensions_to_load=finder_options.extensions_to_load,

target_arch=finder_options.target_arch)

@@ -205,5 +210,5 @@

device = android_device.GetDevice(finder_options)

if not device:

return []

- android_platform = platform.GetPlatformForDevice(device, finder_options)

+ android_platform = platform.GetPlatformForDevice(device)

return _FindAllPossibleBrowsers(finder_options, android_platform)