diff options
| -rw-r--r-- | tools/telemetry/telemetry/core/chrome/android_browser_finder.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py index 86a942f..d3a7bdc 100644 --- a/tools/telemetry/telemetry/core/chrome/android_browser_finder.py +++ b/tools/telemetry/telemetry/core/chrome/android_browser_finder.py @@ -101,6 +101,17 @@ def CanFindAvailableBrowsers(logging=real_logging): adb_works = True else: adb_works = False + if adb_works and sys.platform.startswith('linux'): + # Workaround for crbug.com/268450 + import psutil + adb_commands.GetAttachedDevices() + pids = [p.pid for p in psutil.process_iter() if 'adb' in p.name] + with open(os.devnull, 'w') as devnull: + for pid in pids: + subprocess.check_call(['taskset', '-p', '0x1', str(pid)], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + stdin=devnull) return adb_works |