sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-02-07 05:30:44 +00:00
Code Issues Releases Wiki Activity

Add adb_server option in android background connection

Browse Source 
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
This commit is contained in:
Michalis Spyrou 2019-02-05 16:59:44 +00:00 committed by Marc Bonnici
parent e01a76ef1b
commit c2db6c17ab
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devlib/utils/android.py
View File

@ -308,7 +308,7 @@ class AdbConnection(object):
raise raise
def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False): def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False):
return adb_background_shell(self.device, command, stdout, stderr, as_root) return adb_background_shell(self.device, command, stdout, stderr, as_root, adb_server=self.adb_server)
def close(self): def close(self):
AdbConnection.active_connections[self.device] -= 1 AdbConnection.active_connections[self.device] -= 1
@ -479,12 +479,15 @@ def adb_shell(device, command, timeout=None, check_exit_code=False,
def adb_background_shell(device, command, def adb_background_shell(device, command,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
as_root=False): as_root=False,
adb_server=None):
"""Runs the sepcified command in a subprocess, returning the the Popen object.""" """Runs the sepcified command in a subprocess, returning the the Popen object."""
_check_env() _check_env()
if as_root: if as_root:
command = 'echo {} | su'.format(quote(command)) command = 'echo {} | su'.format(quote(command))
device_string = ' -s {}'.format(device) if device else ''
device_string = ' -H {}'.format(adb_server) if adb_server else ''
device_string += ' -s {}'.format(device) if device else ''
full_command = 'adb{} shell {}'.format(device_string, quote(command)) full_command = 'adb{} shell {}'.format(device_string, quote(command))
logger.debug(full_command) logger.debug(full_command)
return subprocess.Popen(full_command, stdout=stdout, stderr=stderr, shell=True) return subprocess.Popen(full_command, stdout=stdout, stderr=stderr, shell=True)