diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-05 22:45:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-05 22:45:32 +0000 |
| commit | a5e4f4d2969520f4563ec0d66cbe469c49ee38bc (patch) | |
| tree | 8a0d6fd78eb610653f12ded770595c80f1e89a61 /catapult/devil/devil/android/device_list.py | |
| parent | 5e1447373f2b6aaefa0e866c5907a291e7071a3d (diff) | |
| parent | 5338649baa46daab43dd19d939fc1f016d400a94 (diff) | |
| download | chromium-trace-a5e4f4d2969520f4563ec0d66cbe469c49ee38bc.tar.gz | |
Merge changes Ie9f01eed,I3acb8a0d am: fb769a1607 am: 316160b179 am: 3fd616f492 am: 5338649baa
Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1392438
Change-Id: I01f6e9f32cc3210fbc5f6f645a77b74316ecfb3b
Diffstat (limited to 'catapult/devil/devil/android/device_list.py')
| -rw-r--r-- | catapult/devil/devil/android/device_list.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/catapult/devil/devil/android/device_list.py b/catapult/devil/devil/android/device_list.py index 0fbb0f15..cd631dbd 100644 --- a/catapult/devil/devil/android/device_list.py +++ b/catapult/devil/devil/android/device_list.py @@ -1,7 +1,6 @@ # Copyright 2014 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - """A module to keep track of devices across builds.""" import json @@ -26,8 +25,8 @@ def GetPersistentDeviceList(file_name): try: with open(file_name) as f: devices = json.load(f) - if not isinstance(devices, list) or not all(isinstance(d, basestring) - for d in devices): + if not isinstance(devices, list) or not all( + isinstance(d, basestring) for d in devices): logger.warning('Unrecognized device file format: %s', devices) return [] return [d for d in devices if d != '(error)'] |