Chromium Code Reviews| Index: build/android/pylib/android_commands.py |
| diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py |
| index 32121432480103f0e071d4488825ebb6b2fc9011..3492de46d72e7e96dad45613816fe882655fb62b 100644 |
| --- a/build/android/pylib/android_commands.py |
| +++ b/build/android/pylib/android_commands.py |
| @@ -778,7 +778,7 @@ class AndroidCommands(object): |
| self.RunShellCommand(cmd) |
| return len(pids) |
| - def KillAllBlocking(self, process, timeout_sec): |
| + def KillAllBlocking(self, process, timeout_sec, signum=9, with_su=False): |
|
Sami
2014/06/17 20:39:11
nit: use signal.SIGKILL instead of 9.
jbudorick
2014/06/17 21:09:27
Done. (and above in KillAll)
|
| """Blocking version of killall, connected via adb. |
| This waits until no process matching the corresponding name appears in ps' |
| @@ -787,11 +787,12 @@ class AndroidCommands(object): |
| Args: |
| process: name of the process to kill off |
| timeout_sec: the timeout in seconds |
| - |
| + signum: same as |KillAll| |
| + with_su: same as |KillAll| |
| Returns: |
| the number of processes killed |
| """ |
| - processes_killed = self.KillAll(process) |
| + processes_killed = self.KillAll(process, signum=signum, with_su=with_su) |
| if processes_killed: |
| elapsed = 0 |
| wait_period = 0.1 |