aboutsummaryrefslogtreecommitdiff
path: root/catapult/devil/devil/android/tools/script_common.py
diff options
context:
space:
mode:
Diffstat (limited to 'catapult/devil/devil/android/tools/script_common.py')
-rw-r--r--catapult/devil/devil/android/tools/script_common.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/catapult/devil/devil/android/tools/script_common.py b/catapult/devil/devil/android/tools/script_common.py
index eb91cdcb..8e462c35 100644
--- a/catapult/devil/devil/android/tools/script_common.py
+++ b/catapult/devil/devil/android/tools/script_common.py
@@ -8,9 +8,10 @@ from devil.android import device_utils
def GetDevices(requested_devices, blacklist_file):
- blacklist = (device_blacklist.Blacklist(blacklist_file)
- if blacklist_file
- else None)
+ if not isinstance(blacklist_file, device_blacklist.Blacklist):
+ blacklist = (device_blacklist.Blacklist(blacklist_file)
+ if blacklist_file
+ else None)
devices = device_utils.DeviceUtils.HealthyDevices(blacklist)
if not devices: