devil/devil/android/device_utils.py - Issue 2822573002: Fix android_action_runner.InputSwipe and InputText

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: devil/devil/android/device_utils.py

Issue 2822573002: Fix android_action_runner.InputSwipe and InputText (Closed)

Patch Set: Created 3 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:

Index: devil/devil/android/device_utils.py

diff --git a/devil/devil/android/device_utils.py b/devil/devil/android/device_utils.py

index 7ba1b51448713b2ae2964d609d3026b76cf3f53f..c32c35d262cf4266f0fa388f1471c5650aa04910 100644

--- a/devil/devil/android/device_utils.py

+++ b/devil/devil/android/device_utils.py

@@ -1190,7 +1190,12 @@ class DeviceUtils(object):

CommandTimeoutError on timeout.

DeviceUnreachableError on missing device.

"""

- cmd = 'p=%s;if [[ "$(ps)" = *$p* ]]; then am force-stop $p; fi'

+ # ps behavior was changed in Android above N, http://crbug.com/686716

+ if (self.build_version_sdk >= version_codes.NOUGAT_MR1

+ and self.build_id[0] > 'N'):

+ cmd = 'p=%s;if [[ "$(ps -e)" = *$p* ]]; then am force-stop $p; fi'

+ else:

+ cmd = 'p=%s;if [[ "$(ps)" = *$p* ]]; then am force-stop $p; fi'

self.RunShellCommand(cmd % package, shell=True, check_return=True)

@decorators.WithTimeoutAndRetriesFromInstance()