From d0ddb6835a7cf1d375b946c2bfef19a5a0799adf Mon Sep 17 00:00:00 2001 From: gasgallo <36033044+gasgallo@users.noreply.github.com> Date: Thu, 26 Mar 2020 19:01:58 +0700 Subject: [PATCH] Fix adb permissions (#615) * Fix adb list of devices Co-authored-by: riccardo --- tools/device.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/device.py b/tools/device.py index c7e95553..dc51e4ae 100644 --- a/tools/device.py +++ b/tools/device.py @@ -953,14 +953,10 @@ class DeviceWrapper: class DeviceManager: @classmethod def list_adb_device(cls): - adb_list = sh.adb('devices').stdout.decode('utf-8'). \ - strip().split('\n')[1:] - adb_list = [tuple(pair.split('\t')) for pair in adb_list] devices = [] + adb_list = sh_commands.adb_devices() for adb in adb_list: - if adb[1].startswith("no permissions"): - continue - prop = sh_commands.adb_getprop_by_serialno(adb[0]) + prop = sh_commands.adb_getprop_by_serialno(adb) android = { YAMLKeyword.device_name: prop['ro.product.model'].replace(' ', ''), @@ -968,7 +964,7 @@ class DeviceManager: prop['ro.product.cpu.abilist'].split(','), YAMLKeyword.target_socs: prop['ro.board.platform'], YAMLKeyword.system: SystemType.android, - YAMLKeyword.address: adb[0], + YAMLKeyword.address: adb, YAMLKeyword.username: '', } if android not in devices: -- GitLab