Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/android/screenshot.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
« no previous file with comments | « build/android/pylib/local/device/local_device_environment.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/screenshot.py
diff --git a/build/android/screenshot.py b/build/android/screenshot.py
index a0a52afe7b0f3c9611323a0b9297be44f8ebbfe7..839fb55d91eee07dae45da34686b8e72d68a5e2c 100755
--- a/build/android/screenshot.py
+++ b/build/android/screenshot.py
@@ -76,10 +76,9 @@ def main():
if options.verbose:
logging.getLogger().setLevel(logging.DEBUG)
- if options.blacklist_file:
- blacklist = device_blacklist.Blacklist(options.blacklist_file)
- else:
- blacklist = None
+ blacklist = (device_blacklist.Blacklist(options.blacklist_file)
+ if options.blacklist_file
+ else None)
devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
if options.device:
« no previous file with comments | « build/android/pylib/local/device/local_device_environment.py ('k') | build/android/test_runner.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698