tools/telemetry/telemetry/core/forwarders/android_forwarder.py - Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__.

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/forwarders/android_forwarder.py

Issue 404993004: [Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comment from frankf Created 6 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:

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

Download patch

« no previous file with comments | « tools/profile_chrome/systrace_controller.py ('k') | tools/telemetry/telemetry/core/platform/android_platform_backend.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/forwarders/android_forwarder.py

diff --git a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py

index eb56079e4fff2a54c14fdc41cd76f2ffec8fad32..df6dd45b40a0f61594e15f53d28d099a2956b246 100644

--- a/tools/telemetry/telemetry/core/forwarders/android_forwarder.py

+++ b/tools/telemetry/telemetry/core/forwarders/android_forwarder.py

@@ -321,7 +321,7 @@ doit &

"""Returns the IP addresses on all connected devices.

Excludes interface |excluded_iface| on the selected device.

"""

- my_device = self._device.old_interface.GetDevice()

+ my_device = str(self._device)

addresses = []

for device_serial in adb_commands.GetAttachedDevices():

device = adb_commands.AdbCommands(device_serial).device()

« no previous file with comments | « tools/profile_chrome/systrace_controller.py ('k') | tools/telemetry/telemetry/core/platform/android_platform_backend.py » ('j') | no next file with comments »