sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-01-31 02:00:45 +00:00
Code Issues Releases Wiki Activity

utils.android: force as_root=False when connected_as_root

Browse Source 
Some Android devices do not have 'su'. But if they are already
rooted, there's no reason to fail. Circumvent this scenario by never
using 'su' for device already rooted.
This commit is contained in:
Vincent Donnefort 2022-03-21 18:33:29 +00:00 committed by Marc Bonnici
parent f6bbd2c187
commit 7d6ed2dd8a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devlib/utils/android.py
View File

@ -333,6 +333,8 @@ class AdbConnection(ConnectionBase):
# pylint: disable=unused-argument # pylint: disable=unused-argument
def execute(self, command, timeout=None, check_exit_code=False, def execute(self, command, timeout=None, check_exit_code=False,
as_root=False, strip_colors=True, will_succeed=False): as_root=False, strip_colors=True, will_succeed=False):
if as_root and self.connected_as_root:
as_root = False
try: try:
return adb_shell(self.device, command, timeout, check_exit_code, return adb_shell(self.device, command, timeout, check_exit_code,
as_root, adb_server=self.adb_server, su_cmd=self.su_cmd) as_root, adb_server=self.adb_server, su_cmd=self.su_cmd)
@ -351,6 +353,8 @@ class AdbConnection(ConnectionBase):
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):
if as_root and self.connected_as_root:
as_root = False
bg_cmd = self._background(command, stdout, stderr, as_root) bg_cmd = self._background(command, stdout, stderr, as_root)
self._current_bg_cmds.add(bg_cmd) self._current_bg_cmds.add(bg_cmd)
return bg_cmd return bg_cmd
@ -413,6 +417,9 @@ class AdbConnection(ConnectionBase):
logger.debug("ls command is set to {}".format(self.ls_command)) logger.debug("ls command is set to {}".format(self.ls_command))
def _setup_su(self): def _setup_su(self):
# Already root, nothing to do
if self.connected_as_root:
return
try: try:
# Try the new style of invoking `su` # Try the new style of invoking `su`
self.execute('ls', timeout=self.timeout, as_root=True, self.execute('ls', timeout=self.timeout, as_root=True,