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

Unified Diff: build/android/devil/android/device_utils.py

Issue 1334803002: Revert of [Android] Don't use a device blacklist if one isn't provided. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/devil/android/device_blacklist.py ('k') | build/android/enable_asserts.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/android/device_utils.py
diff --git a/build/android/devil/android/device_utils.py b/build/android/devil/android/device_utils.py
index c318b69928c28fd3e47ca038b26b5f8b29e0ac99..5be914cdbdaae803747c576581a672ff53416aed 100644
--- a/build/android/devil/android/device_utils.py
+++ b/build/android/devil/android/device_utils.py
@@ -25,6 +25,7 @@
from devil.android import apk_helper
from devil.android import device_signal
from devil.android import decorators
+from devil.android import device_blacklist
from devil.android import device_errors
from devil.android import device_temp_file
from devil.android import logcat_monitor
@@ -1931,7 +1932,11 @@
@classmethod
def HealthyDevices(cls, blacklist=None, **kwargs):
- blacklisted_devices = blacklist.Read() if blacklist else []
+ if not blacklist:
+ # TODO(jbudorick): Remove once clients pass in the blacklist.
+ blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON)
+
+ blacklisted_devices = blacklist.Read()
def blacklisted(adb):
if adb.GetDeviceSerial() in blacklisted_devices:
logging.warning('Device %s is blacklisted.', adb.GetDeviceSerial())
« no previous file with comments | « build/android/devil/android/device_blacklist.py ('k') | build/android/enable_asserts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698