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

Unified Diff: build/android/pylib/device/device_utils.py

Issue 1083403002: [Android] Remove android_commands uses from build/android/. (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed Created 5 years, 8 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 17a474d566a731e81e9a77034266fe4937ca9b73..ddda0178bc8a60603c0475c4e6f8f005e03b6ddc 100644
--- a/build/android/pylib/device/device_utils.py
+++ b/build/android/pylib/device/device_utils.py
@@ -30,6 +30,7 @@ from pylib.device import adb_wrapper
from pylib.device import decorators
from pylib.device import device_blacklist
from pylib.device import device_errors
+from pylib.device import device_filter
from pylib.device import intent
from pylib.device import logcat_monitor
from pylib.device.commands import install_commands
@@ -1559,9 +1560,8 @@ class DeviceUtils(object):
A Parallelizer operating over |devices|.
"""
if not devices:
- blacklist = device_blacklist.ReadBlacklist()
- devices = [d for d in adb_wrapper.AdbWrapper.GetDevices()
- if d.GetDeviceSerial() not in blacklist]
+ devices = adb_wrapper.AdbWrapper.Devices(
+ filters=device_filter.DefaultFilters())
if not devices:
raise device_errors.NoDevicesError()

Powered by Google App Engine
This is Rietveld 408576698