build/android/pylib/android_commands.py - Issue 822713002: Update from https://crrev.com/309415

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/android_commands.py

Issue 822713002: Update from https://crrev.com/309415 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/android/pylib/android_commands.py

diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py

index 8d7866dc9362bcc86b7d607f3e3923c4ee80900e..d6f9d326ba9c0d92b4a456e4c89a167ee8cac151 100644

--- a/build/android/pylib/android_commands.py

+++ b/build/android/pylib/android_commands.py

@@ -177,7 +177,8 @@ def GetAttachedDevices(hardware=True, emulator=True, offline=False):

re_device = re.compile('^(emulator-[0-9]+)\tdevice', re.MULTILINE)

emulator_devices = re_device.findall(adb_devices_output)

- re_device = re.compile('^([a-zA-Z0-9_:.-]+)\toffline$', re.MULTILINE)

+ re_device = re.compile('^([a-zA-Z0-9_:.-]+)\t(?:offline|unauthorized)$',

+ re.MULTILINE)

offline_devices = re_device.findall(adb_devices_output)

devices = []