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..0d3ead75cec723b6e8b0896b5f529ce228d761ae 100644 |
--- a/build/android/pylib/android_commands.py |
+++ b/build/android/pylib/android_commands.py |
@@ -758,7 +758,7 @@ class AndroidCommands(object): |
lines = lines[:-1] + [last_line[:status_pos]] |
return (status, lines) |
- def KillAll(self, process, signum=9, with_su=False): |
+ def KillAll(self, process, signum=signal.SIGKILL, with_su=False): |
"""Android version of killall, connected via adb. |
Args: |
@@ -778,7 +778,8 @@ class AndroidCommands(object): |
self.RunShellCommand(cmd) |
return len(pids) |
- def KillAllBlocking(self, process, timeout_sec): |
+ def KillAllBlocking(self, process, timeout_sec, signum=signal.SIGKILL, |
+ with_su=False): |
"""Blocking version of killall, connected via adb. |
This waits until no process matching the corresponding name appears in ps' |
@@ -787,11 +788,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 |