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

Unified Diff: build/android/pylib/device/device_utils.py

Issue 375603003: [Android] Ignore exceptions when provision attempts to write local props. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 | « build/android/provision_devices.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/device/device_utils.py
diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py
index 28d258f4d12a080d604d16a4924315dfa47da505..240e603682e40e67dda4a494318f246dbf2fd574 100644
--- a/build/android/pylib/device/device_utils.py
+++ b/build/android/pylib/device/device_utils.py
@@ -320,7 +320,7 @@ class DeviceUtils(object):
signum: An integer containing the signal number to send to kill. Defaults
to 9 (SIGKILL).
as_root: A boolean indicating whether the kill should be executed with
- root priveleges.
+ root privileges.
blocking: A boolean indicating whether we should wait until all processes
with the given |process_name| are dead.
timeout: Same as for |IsOnline|.
@@ -504,7 +504,7 @@ class DeviceUtils(object):
device_path: A string containing the absolute path of the file to read
from the device.
as_root: A boolean indicating whether the read should be executed with
- root priveleges.
+ root privileges.
timeout: Same as for |IsOnline|.
retries: Same as for |IsOnline|.
Returns:
@@ -517,7 +517,7 @@ class DeviceUtils(object):
if as_root:
if not self.old_interface.CanAccessProtectedFileContents():
raise device_errors.CommandFailedError(
- 'Cannot read from %s with root priveleges.' % device_path)
+ 'Cannot read from %s with root privileges.' % device_path)
return self.old_interface.GetProtectedFileContents(device_path)
else:
return self.old_interface.GetFileContents(device_path)
@@ -532,7 +532,7 @@ class DeviceUtils(object):
on the device.
contents: A string containing the data to write to the device.
as_root: A boolean indicating whether the write should be executed with
- root priveleges.
+ root privileges.
timeout: Same as for |IsOnline|.
retries: Same as for |IsOnline|.
Raises:
@@ -541,7 +541,7 @@ class DeviceUtils(object):
if as_root:
if not self.old_interface.CanAccessProtectedFileContents():
raise device_errors.CommandFailedError(
- 'Cannot write to %s with root priveleges.' % device_path)
+ 'Cannot write to %s with root privileges.' % device_path)
self.old_interface.SetProtectedFileContents(device_path, contents)
else:
self.old_interface.SetFileContents(device_path, contents)
« no previous file with comments | « build/android/provision_devices.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698