libs/android: Add get_adb_command function
This is just like adb_command but instead of executing the command it just
returns it.
diff --git a/devlib/utils/android.py b/devlib/utils/android.py
index 0cdd2b0..b5dabaf 100644
--- a/devlib/utils/android.py
+++ b/devlib/utils/android.py
@@ -442,13 +442,16 @@
return devices
-def adb_command(device, command, timeout=None,adb_server=None):
+def get_adb_command(device, command, timeout=None,adb_server=None):
_check_env()
device_string = ""
if adb_server != None:
device_string = ' -H {}'.format(adb_server)
device_string += ' -s {}'.format(device) if device else ''
- full_command = "adb{} {}".format(device_string, command)
+ return "adb{} {}".format(device_string, command)
+
+def adb_command(device, command, timeout=None,adb_server=None):
+ full_command = get_adb_command(device, command, timeout, adb_server)
logger.debug(full_command)
output, _ = check_output(full_command, timeout, shell=True)
return output