[Android] Rework device filtering and add DeviceUtils.HealthyDevices.

BUG=267773

Review URL: https://codereview.chromium.org/1101603002

Cr-Commit-Position: refs/heads/master@{#326825}

1 files changed, 4 insertions, 6 deletions

diff --git a/build/android/tombstones.py b/build/android/tombstones.py
index 3f35086..c83a584 100755
--- a/build/android/tombstones.py
+++ b/build/android/tombstones.py
@@ -21,7 +21,6 @@ import optparse
 
 from pylib.device import adb_wrapper
 from pylib.device import device_errors
-from pylib.device import device_filter
 from pylib.device import device_utils
 from pylib.utils import run_tests_helper
 
@@ -234,20 +233,19 @@ def main():
   options, _ = parser.parse_args()
 
   if options.device:
-    devices = [options.device]
+    devices = [device_utils.DeviceUtils(options.device)]
   else:
-    devices = adb_wrapper.AdbWrapper.Devices(
-        filters=device_filter.DefaultFilters())
+    devices = device_utils.DeviceUtils.HealthyDevices()
 
   # This must be done serially because strptime can hit a race condition if
   # used for the first time in a multithreaded environment.
   # http://bugs.python.org/issue7980
   tombstones = []
-  for adb in devices:
-    device = device_utils.DeviceUtils(adb)
+  for device in devices:
     tombstones += _GetTombstonesForDevice(device, options)
 
   _ResolveTombstones(options.jobs, tombstones)
 
+
 if __name__ == '__main__':
   sys.exit(main())