tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py - Issue 243403003: [Android] Change object types from AndroidCommands to DeviceUtils everywhere else.

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/platform/profiler/tcpdump_profiler.py

Issue 243403003: [Android] Change object types from AndroidCommands to DeviceUtils everywhere else. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 8 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/platform/profiler/tcmalloc_heap_profiler.py ('k') | tools/telemetry/telemetry/core/platform/profiler/v8_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

diff --git a/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

index bbcb2090c1c03d898b6de675baf4231ee146038a..c472502aeeb40cd036d27efab8fe7a551c056392 100644

--- a/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

+++ b/tools/telemetry/telemetry/core/platform/profiler/tcpdump_profiler.py

@@ -30,7 +30,7 @@ class _TCPDumpProfilerAndroid(object):

self._adb.RunShellCommand('mkdir -p ' +

os.path.dirname(self._DEVICE_DUMP_FILE))

self._proc = subprocess.Popen(

- ['adb', '-s', self._adb.device(),

+ ['adb', '-s', self._adb.device_serial(),

'shell', android_prebuilt_profiler_helper.GetDevicePath('tcpdump')] +

_TCP_DUMP_BASE_OPTS +

[self._DEVICE_DUMP_FILE])

@@ -45,7 +45,8 @@ class _TCPDumpProfilerAndroid(object):

self._proc.terminate()

host_dump = os.path.join(self._output_path,

os.path.basename(self._DEVICE_DUMP_FILE))

- self._adb.Adb().Adb().Pull(self._DEVICE_DUMP_FILE, host_dump)

+ self._adb.device().old_interface.Adb().Pull(self._DEVICE_DUMP_FILE,

+ host_dump)

print 'TCP dump available at: %s ' % host_dump

print 'Use Wireshark to open it.'

return host_dump

@@ -99,7 +100,7 @@ class TCPDumpProfiler(profiler.Profiler):

browser_backend, platform_backend, output_path, state)

if platform_backend.GetOSName() == 'android':

android_prebuilt_profiler_helper.InstallOnDevice(

- browser_backend.adb.Adb(), 'tcpdump')

+ browser_backend.adb.device(), 'tcpdump')

self._platform_profiler = _TCPDumpProfilerAndroid(

browser_backend.adb, output_path)

else: