tools/telemetry/telemetry/core/platform/profiler/android_traceview_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/android_traceview_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/android_screen_recorder_profiler.py ('k') | tools/telemetry/telemetry/core/platform/profiler/java_heap_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a1d3510ab3f53884b2d1f80f8fd86eaa60d606e2..9513f0b9549537e745ff6906e3f6d387d22d922c 100644

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

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

@@ -18,7 +18,7 @@ class AndroidTraceviewProfiler(profiler.Profiler):

super(AndroidTraceviewProfiler, self).__init__(

browser_backend, platform_backend, output_path, state)

- if self._browser_backend.adb.Adb().FileExistsOnDevice(

+ if self._browser_backend.adb.device().old_interface.FileExistsOnDevice(

self._DEFAULT_DEVICE_DIR):

self._browser_backend.adb.RunShellCommand(

'rm ' + os.path.join(self._DEFAULT_DEVICE_DIR, '*'))

@@ -52,7 +52,7 @@ class AndroidTraceviewProfiler(profiler.Profiler):

self._browser_backend.adb.RunShellCommand('am profile %s stop' % pid)

util.WaitFor(lambda: self._FileSize(trace_file) > 0, timeout=10)

output_files.append(trace_file)

- self._browser_backend.adb.Adb().Adb().Pull(

+ self._browser_backend.adb.device().old_interface.Adb().Pull(

self._DEFAULT_DEVICE_DIR, self._output_path)

self._browser_backend.adb.RunShellCommand(

'rm ' + os.path.join(self._DEFAULT_DEVICE_DIR, '*'))

@@ -62,5 +62,6 @@ class AndroidTraceviewProfiler(profiler.Profiler):

return output_files

def _FileSize(self, file_name):

- f = self._browser_backend.adb.Adb().ListPathContents(file_name)

+ f = self._browser_backend.adb.device().old_interface.ListPathContents(

+ file_name)

return f.get(os.path.basename(file_name), (0, ))[0]