build/android/pylib/device/device_utils.py - Issue 420273006: [Android] Fix DeviceUtils.__str__ when no serial is provided.

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/device/device_utils.py

Issue 420273006: [Android] Fix DeviceUtils.__str__ when no serial is provided. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address comments from frankf 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/device/device_utils.py

diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py

index 997405a07d6e570d425ceeacbfe382a7c238becb..ef2ddcd8dad5f7dde32589e6c24585cdf84ca8ce 100644

--- a/build/android/pylib/device/device_utils.py

+++ b/build/android/pylib/device/device_utils.py

@@ -790,7 +790,10 @@ class DeviceUtils(object):

def __str__(self):

"""Returns the device serial."""

- return self.old_interface.GetDevice()

+ s = self.old_interface.GetDevice()

+ if not s:

+ s = self.old_interface.Adb().GetSerialNumber()

frankf 2014/07/28 23:08:28 can this be None as well?

+ return s

@staticmethod

def parallel(devices=None, async=False):

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