build/android/pylib/android_commands.py - Issue 737943002: Update from https://crrev.com/304715

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 737943002: Update from https://crrev.com/304715 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month 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 ea86e6d90176beddca6f2f5c7217635793a09f72..6981afcc9afd25710e3abea0b590b564d6b95147 100644

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

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

@@ -1927,7 +1927,8 @@ class AndroidCommands(object):

# to the device.

while True:

if t0 + timeout - time.time() < 0:

- raise pexpect.TIMEOUT('Unable to enable USB charging in time.')

+ raise pexpect.TIMEOUT('Unable to disable USB charging in time: %s' % (

+ self.GetBatteryInfo()))

self.RunShellCommand(disable_command)

if not self.IsDeviceCharging():

break