Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: build/android/pylib/forwarder.py

Issue 386053002: [Android] Switch to DeviceUtils versions of GetPid, TakeScreenshot, and GetIoStats. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change GetPids and fix screenshot Created 6 years, 5 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:
View side-by-side diff with in-line comments
Download patch
Index: build/android/pylib/forwarder.py
diff --git a/build/android/pylib/forwarder.py b/build/android/pylib/forwarder.py
index ad22838d87291d7d2421bb176392155c1473a759..b19c99e67260bd9f6ef8a6fc30092c05e3ea171f 100644
--- a/build/android/pylib/forwarder.py
+++ b/build/android/pylib/forwarder.py
@@ -341,9 +341,7 @@ class Forwarder(object):
# 'kill-server') is not running on the bots anymore.
timeout_sec = 5
try:
- device.KillAll(
- 'device_forwarder', blocking=True, timeout=timeout_sec)
+ device.KillAll('device_forwarder', blocking=True, timeout=timeout_sec)
except device_errors.CommandFailedError:
- pids = device.old_interface.ExtractPid('device_forwarder')
- if pids:
+ if device.GetPids('device_forwarder'):
raise

Powered by Google App Engine
This is Rietveld 408576698