未验证 提交 d0ddb683 编写于 作者: G gasgallo 提交者: GitHub

Fix adb permissions (#615)

* Fix adb list of devices
Co-authored-by: Nriccardo <rgall@sertiscorp.com>
上级 446bb57c
...@@ -953,14 +953,10 @@ class DeviceWrapper: ...@@ -953,14 +953,10 @@ class DeviceWrapper:
class DeviceManager: class DeviceManager:
@classmethod @classmethod
def list_adb_device(cls): 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 = [] devices = []
adb_list = sh_commands.adb_devices()
for adb in adb_list: for adb in adb_list:
if adb[1].startswith("no permissions"): prop = sh_commands.adb_getprop_by_serialno(adb)
continue
prop = sh_commands.adb_getprop_by_serialno(adb[0])
android = { android = {
YAMLKeyword.device_name: YAMLKeyword.device_name:
prop['ro.product.model'].replace(' ', ''), prop['ro.product.model'].replace(' ', ''),
...@@ -968,7 +964,7 @@ class DeviceManager: ...@@ -968,7 +964,7 @@ class DeviceManager:
prop['ro.product.cpu.abilist'].split(','), prop['ro.product.cpu.abilist'].split(','),
YAMLKeyword.target_socs: prop['ro.board.platform'], YAMLKeyword.target_socs: prop['ro.board.platform'],
YAMLKeyword.system: SystemType.android, YAMLKeyword.system: SystemType.android,
YAMLKeyword.address: adb[0], YAMLKeyword.address: adb,
YAMLKeyword.username: '', YAMLKeyword.username: '',
} }
if android not in devices: if android not in devices:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册