tools/telemetry/telemetry/core/platform/profiler/netlog_profiler.py - Issue 1167173002: [Android] Remove adb_commands from telemetry. (Reland)

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/netlog_profiler.py

Issue 1167173002: [Android] Remove adb_commands from telemetry. (Reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix non-rooted devices Created 5 years, 6 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/java_heap_profiler.py ('k') | tools/telemetry/telemetry/core/platform/profiler/oomkiller_profiler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b63596ade52e3b6811358171a0a3622cd90541e1..4cb7e0ad9ea4b86e5f6e374d45f699e970c659f3 100644

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

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

@@ -2,7 +2,6 @@

# Use of this source code is governed by a BSD-style license that can be

# found in the LICENSE file.

-import logging

import tempfile

from telemetry.core.platform import profiler

@@ -37,14 +36,9 @@ class NetLogProfiler(profiler.Profiler):

# On Android pull the output file to the host.

if self._platform_backend.GetOSName() == 'android':

host_output_file = '%s.json' % self._output_path

- try:

- self._browser_backend.adb.device().PullFile(

- output_file, host_output_file)

- except:

- logging.exception('New exception caused by DeviceUtils conversion')

- raise

+ self._browser_backend.device.PullFile(output_file, host_output_file)

# Clean the device

- self._browser_backend.adb.device().RunShellCommand('rm %s' % output_file)

+ self._browser_backend.device.RunShellCommand('rm %s' % output_file)

output_file = host_output_file

print 'Net-internals log saved as %s' % output_file

print 'To view, open in chrome://net-internals'