diff options
| author | sullivan <sullivan@chromium.org> | 2015-07-14 14:01:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 21:02:31 +0000 |
| commit | ec34450ee9059cedc3fd0576bd964d06a319d7d3 (patch) | |
| tree | 8a6ed78a42a67384d53f123124c781593d730e41 | |
| parent | 95b07cd477e453640ede914c18f247203e3c8a32 (diff) | |
| download | chromium_src-ec34450ee9059cedc3fd0576bd964d06a319d7d3.zip chromium_src-ec34450ee9059cedc3fd0576bd964d06a319d7d3.tar.gz chromium_src-ec34450ee9059cedc3fd0576bd964d06a319d7d3.tar.bz2 | |
Fix errors in conversion from adb->device
BUG=476709
Review URL: https://codereview.chromium.org/1238793002
Cr-Commit-Position: refs/heads/master@{#338735}
| -rw-r--r-- | tools/telemetry/telemetry/internal/backends/android_app_backend.py | 2 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/internal/forwarders/android_forwarder.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/telemetry/telemetry/internal/backends/android_app_backend.py b/tools/telemetry/telemetry/internal/backends/android_app_backend.py index 84bdfd9..1ab29fc 100644 --- a/tools/telemetry/telemetry/internal/backends/android_app_backend.py +++ b/tools/telemetry/telemetry/internal/backends/android_app_backend.py @@ -58,7 +58,7 @@ class AndroidAppBackend(app_backend.AppBackend): android_browser_backend_settings.WebviewBackendSettings( 'android-webview')) with android_command_line_backend.SetUpCommandLineFlags( - self._device, backend_settings, webview_startup_args): + self.device, backend_settings, webview_startup_args): self._LaunchAndWaitForApplication() else: self._LaunchAndWaitForApplication() diff --git a/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py b/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py index 11e3a60..2a599e4 100644 --- a/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py +++ b/tools/telemetry/telemetry/internal/forwarders/android_forwarder.py @@ -184,8 +184,8 @@ class AndroidRndisConfigurator(object): _INTERFACES_INCLUDE = 'source /etc/network/interfaces.d/*.conf' _TELEMETRY_INTERFACE_FILE = '/etc/network/interfaces.d/telemetry-{}.conf' - def __init__(self, adb): - self._device = adb.device() + def __init__(self, device): + self._device = device try: self._device.EnableRoot() |