tools/telemetry/telemetry/core/platform/android_platform_backend.py - Issue 796433002: Revert of Migrate DeviceUtils.ReadFile to adb_wrapper

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

Issue 796433002: Revert of Migrate DeviceUtils.ReadFile to adb_wrapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: tools/telemetry/telemetry/core/platform/android_platform_backend.py

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

index 10bc1bdb78d29a1252fd29b00d1663716fa8a24f..e031dd362b8d7ddee5153bbab4284af261efc8f5 100644

--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py

+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py

@@ -317,7 +317,7 @@

if not self._can_access_protected_file_contents:

logging.warning('%s cannot be retrieved on non-rooted device.' % fname)

return ''

- return self._device.ReadFile(fname, as_root=True)

+ return '\n'.join(self._device.ReadFile(fname, as_root=True))

def GetPsOutput(self, columns, pid=None):

assert columns == ['pid', 'name'] or columns == ['pid'], \