Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: tools/telemetry/telemetry/core/backends/adb_commands.py

Issue 99713002: Factor out a system_properties interface for interacting with getprop/setprop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use shlex.split() Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/backends/adb_commands.py
diff --git a/tools/telemetry/telemetry/core/backends/adb_commands.py b/tools/telemetry/telemetry/core/backends/adb_commands.py
index 9d067cafef786d6ed56802813966af7c56c53e1f..f657d5d3ae6d54f709fa2e830c0f982de59fcb43 100644
--- a/tools/telemetry/telemetry/core/backends/adb_commands.py
+++ b/tools/telemetry/telemetry/core/backends/adb_commands.py
@@ -57,12 +57,16 @@ class AdbCommands(object):
"""A thin wrapper around ADB"""
def __init__(self, device):
- self._adb = android_commands.AndroidCommands(device)
+ self._adb = android_commands.AndroidCommands(device, api_strict_mode=True)
self._device = device
def device(self):
return self._device
+ @property
+ def system_properties(self):
+ return self._adb.system_properties
+
def Adb(self):
return self._adb
@@ -86,6 +90,9 @@ class AdbCommands(object):
"""
return self._adb.RunShellCommand(command, timeout_time, log_result)
+ def RunShellCommandWithSU(self, command, timeout_time=20, log_result=False):
+ return self._adb.RunShellCommandWithSU(command, timeout_time, log_result)
+
def CloseApplication(self, package):
"""Attempt to close down the application, using increasing violence.
@@ -193,8 +200,8 @@ def SetupPrebuiltTools(adb):
# Prebuilt tools from r226197.
has_prebuilt = sys.platform.startswith('linux')
if has_prebuilt:
- abi = adb.RunShellCommand('getprop ro.product.cpu.abi')
- has_prebuilt = abi and abi[0].startswith('armeabi')
+ abi = adb.system_properties['ro.product.cpu.abi']
+ has_prebuilt = abi.startswith('armeabi')
if not has_prebuilt:
logging.error(
'Prebuilt android tools only available for Linux host and ARM device.')

Powered by Google App Engine
This is Rietveld 408576698