build/android/provision_devices.py - Issue 1079113002: [Android] Add a "quiet" flag so KillAll doesn't complain if no processes killed

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: build/android/provision_devices.py

Issue 1079113002: [Android] Add a "quiet" flag so KillAll doesn't complain if no processes killed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix typo Created 5 years, 8 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

Index: build/android/provision_devices.py

diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py

index ccb4183ab31c7e14376699b4f87c3c51def54516..33f8bf47a75161b91ace09cbce9a48a717bb6362 100755

--- a/build/android/provision_devices.py

+++ b/build/android/provision_devices.py

@@ -232,14 +232,7 @@ def _PushAndLaunchAdbReboot(device, target):

"""

logging.info('Will push and launch adb_reboot on %s' % str(device))

# Kill if adb_reboot is already running.

- try:

- # Don't try to kill adb_reboot more than once. We don't expect it to be

- # running at all.

- device.KillAll('adb_reboot', blocking=True, timeout=2, retries=0)

- except device_errors.CommandFailedError:

- # We can safely ignore the exception because we don't expect adb_reboot

- # to be running.

- pass

+ device.KillAll('adb_reboot', blocking=True, timeout=2, quiet=True)

# Push adb_reboot

logging.info(' Pushing adb_reboot ...')

adb_reboot = os.path.join(constants.DIR_SOURCE_ROOT,

« no previous file with comments | « no previous file | build/android/pylib/device/device_utils.py » ('j') | no next file with comments »