build/android/pylib/forwarder.py - Issue 386053002: [Android] Switch to DeviceUtils versions of GetPid, TakeScreenshot, and GetIoStats.

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: 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: rebase again 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

« no previous file with comments | « build/android/pylib/device/device_utils_test.py ('k') | build/android/pylib/instrumentation/test_runner.py » ('j') | no next file with comments »