Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py

Issue 794583004: Reland of Migrate DeviceUtils.ReadFile to adb_wrapper (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: command line file should be read as_root 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 | « build/android/tombstones.py ('k') | tools/telemetry/telemetry/core/forwarders/android_forwarder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4b486beab404c4e0f3bb6dddd9156522fa8676ac..73087ea76715633dafc7c86dfebb8702115306d1 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
@@ -223,7 +223,8 @@ class AndroidBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
# 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 = ''.join(self._adb.device().ReadFile(cmdline_file))
+ self._saved_cmdline = self._adb.device().ReadFile(
+ cmdline_file, as_root=True)
perezju 2014/12/10 17:22:27 Turns out, this was silently failing (and returnin
jbudorick 2014/12/11 01:56:24 ... and implementing ReadFile with RunShellCommand
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 »

Powered by Google App Engine
This is Rietveld 408576698