tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py - Issue 796013004: Revert of Reland 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/backends/chrome/android_browser_backend.py

Issue 796013004: Revert of Reland 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

Index: tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

diff --git a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

index 73087ea76715633dafc7c86dfebb8702115306d1..4b486beab404c4e0f3bb6dddd9156522fa8676ac 100644

--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

@@ -223,8 +223,7 @@

# be a Telemetry created one. This is to prevent a common bug where

# --host-resolver-rules borks people's browsers if something goes wrong

# with Telemetry.

- self._saved_cmdline = self._adb.device().ReadFile(

- cmdline_file, as_root=True)

+ self._saved_cmdline = ''.join(self._adb.device().ReadFile(cmdline_file))

if '--host-resolver-rules' in self._saved_cmdline:

self._saved_cmdline = ''

self._adb.device().WriteFile(cmdline_file, content, as_root=True)

« no previous file with comments | « build/android/tombstones.py ('k') | tools/telemetry/telemetry/core/forwarders/android_forwarder.py » ('j') | no next file with comments »