diff options
| author | jbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 05:09:06 +0000 |
|---|---|---|
| committer | jbudorick@chromium.org <jbudorick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 05:09:06 +0000 |
| commit | 402e54cdd29cdb022edaebcbe4e0ba44662647c6 (patch) | |
| tree | 3804b88c2b65692f27df8a4f92cba6dc37110f41 /build/android/pylib/forwarder.py | |
| parent | acbb5366e5b2299fe1868938ec5e9876baa10f98 (diff) | |
| download | chromium_src-402e54cdd29cdb022edaebcbe4e0ba44662647c6.zip chromium_src-402e54cdd29cdb022edaebcbe4e0ba44662647c6.tar.gz chromium_src-402e54cdd29cdb022edaebcbe4e0ba44662647c6.tar.bz2 | |
[Android] Switch KillAll, StartActivity, and BroadcastIntent to DeviceUtils.
BUG=267773
Review URL: https://codereview.chromium.org/338353004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android/pylib/forwarder.py')
| -rw-r--r-- | build/android/pylib/forwarder.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py index aec572c..f0ddb2e 100644 --- a/build/android/pylib/forwarder.py +++ b/build/android/pylib/forwarder.py @@ -12,6 +12,7 @@ import psutil from pylib import cmd_helper from pylib import constants from pylib import valgrind_tools +from pylib.device import device_errors # TODO(jbudorick) Remove once telemetry gets switched over. import pylib.android_commands @@ -340,9 +341,10 @@ class Forwarder(object): # sure that the old version of device_forwarder (not supporting # 'kill-server') is not running on the bots anymore. timeout_sec = 5 - processes_killed = device.old_interface.KillAllBlocking( - 'device_forwarder', timeout_sec) - if not processes_killed: + try: + device.KillAll( + 'device_forwarder', blocking=True, timeout=timeout_sec) + except device_errors.CommandFailedError: pids = device.old_interface.ExtractPid('device_forwarder') if pids: - raise Exception('Timed out while killing device_forwarder') + raise |