| 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 130362b29347a61a8e54f3d7af1a83890cfce1e8..3e416736f2a52abb4d358ad960f4ece0af43a0a2 100644
|
| --- a/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
|
| +++ b/tools/telemetry/telemetry/core/backends/chrome/android_browser_backend.py
|
| @@ -216,6 +216,7 @@
|
| content = ' '.join(QuoteIfNeeded(arg) for arg in args)
|
| cmdline_file = self._backend_settings.GetCommandLineFile(
|
| self._adb.IsUserBuild())
|
| + as_root = self._adb.device().old_interface.CanAccessProtectedFileContents()
|
|
|
| try:
|
| # Save the current command line to restore later, except if it appears to
|
| @@ -225,7 +226,7 @@
|
| 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)
|
| + self._adb.device().WriteTextFile(cmdline_file, content, as_root=as_root)
|
| except device_errors.CommandFailedError:
|
| logging.critical('Cannot set Chrome command line. '
|
| 'Fix this by flashing to a userdebug build.')
|
| @@ -234,8 +235,9 @@
|
| def _RestoreCommandLine(self):
|
| cmdline_file = self._backend_settings.GetCommandLineFile(
|
| self._adb.IsUserBuild())
|
| - self._adb.device().WriteFile(cmdline_file, self._saved_cmdline,
|
| - as_root=True)
|
| + as_root = self._adb.device().old_interface.CanAccessProtectedFileContents()
|
| + self._adb.device().WriteTextFile(cmdline_file, self._saved_cmdline,
|
| + as_root=as_root)
|
|
|
| def Start(self):
|
| self._SetUpCommandLine()
|
|
|