Index: tools/telemetry/telemetry/unittest_util/system_stub.py |
diff --git a/tools/telemetry/telemetry/unittest_util/system_stub.py b/tools/telemetry/telemetry/unittest_util/system_stub.py |
index 72fca71c99707b35568c5ef2dd3125bb58c0dda1..9ffd53a82450b92721b7ed1011be8f1b9f54c03b 100644 |
--- a/tools/telemetry/telemetry/unittest_util/system_stub.py |
+++ b/tools/telemetry/telemetry/unittest_util/system_stub.py |
@@ -60,15 +60,6 @@ class Override(object): |
self._overrides = {} |
-class AndroidCommands(object): |
- |
- def __init__(self): |
- self.can_access_protected_file_contents = False |
- |
- def CanAccessProtectedFileContents(self): |
- return self.can_access_protected_file_contents |
- |
- |
class AdbDevice(object): |
def __init__(self): |
@@ -77,7 +68,12 @@ class AdbDevice(object): |
self.system_properties = {} |
if self.system_properties.get('ro.product.cpu.abi') == None: |
self.system_properties['ro.product.cpu.abi'] = 'armeabi-v7a' |
- self.old_interface = AndroidCommands() |
+ |
+ def HasRoot(self): |
+ return self.has_root |
+ |
+ def NeedsSU(self): |
+ return self.needs_su |
def RunShellCommand(self, args, **_kwargs): |
if isinstance(args, basestring): |