build/android/pylib/local/device/local_device_environment.py - Issue 1331213004: [Android] Don't use a device blacklist if one isn't provided. (RELAND 2)

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

Issue 1331213004: [Android] Don't use a device blacklist if one isn't provided. (RELAND 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: + adb_install_apk.py blacklist Created 5 years, 3 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/local/device/local_device_environment.py

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

index f7e1b0aec5a3c70cf297bfedad7ab8c3e11e6f7f..1179039335ffc80dd5f6ec240e2aaff4bbe357fc 100644

--- a/build/android/pylib/local/device/local_device_environment.py

+++ b/build/android/pylib/local/device/local_device_environment.py

@@ -13,8 +13,9 @@ class LocalDeviceEnvironment(environment.Environment):

def __init__(self, args, _error_func):

super(LocalDeviceEnvironment, self).__init__()

- self._blacklist = device_blacklist.Blacklist(

- args.blacklist_file or device_blacklist.BLACKLIST_JSON)

+ self._blacklist = (device_blacklist.Blacklist(args.blacklist_file)

+ if args.blacklist_file

+ else None)

self._device_serial = args.test_device

self._devices = []

self._max_tries = 1 + args.num_retries

« no previous file with comments | « build/android/provision_devices.py ('k') | build/android/screenshot.py » ('j') | no next file with comments »