devil/devil/android/device_utils.py - Issue 2815573003: Fix force stop using wrong "ps" cmd.

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 2815573003: Fix force stop using wrong "ps" cmd. (Closed)

Patch Set: Fix force stop using wrong "ps" cmd. 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 50f362c3839974e7d296ff08c6cc7669b63b3a85..504533ec14cee4b7219322d74139881264323992 100644

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

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

@@ -1181,8 +1181,8 @@ class DeviceUtils(object):

CommandTimeoutError on timeout.

DeviceUnreachableError on missing device.

"""

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

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

+ if self.GetPids(package):

+ self.RunShellCommand(['am', 'force-stop', package], check_return=True)

@decorators.WithTimeoutAndRetriesFromInstance()

def ClearApplicationState(

« no previous file with comments | « no previous file | devil/devil/android/device_utils_test.py » ('j') | no next file with comments »