aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/skpbench/_hardware_android.py
diff options
context:
space:
mode:
Diffstat (limited to 'tools/skpbench/_hardware_android.py')
-rw-r--r--tools/skpbench/_hardware_android.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/skpbench/_hardware_android.py b/tools/skpbench/_hardware_android.py
index ebaba0ab6d..fd001b201d 100644
--- a/tools/skpbench/_hardware_android.py
+++ b/tools/skpbench/_hardware_android.py
@@ -20,6 +20,10 @@ class HardwareAndroid(Hardware):
self._adb.check('cat /proc/sys/kernel/randomize_va_space')
def __enter__(self):
+ Hardware.__enter__(self)
+ if not self._adb.is_root() and self._adb.root():
+ self._adb.remount()
+
self._adb.shell('\n'.join([
# turn on airplane mode.
'''
@@ -53,7 +57,7 @@ class HardwareAndroid(Hardware):
print("WARNING: no adb root access; results may be unreliable.",
file=sys.stderr)
- return Hardware.__enter__(self)
+ return self
def __exit__(self, exception_type, exception_value, traceback):
Hardware.__exit__(self, exception_type, exception_value, traceback)
@@ -102,6 +106,3 @@ class HardwareAndroid(Hardware):
done''')
Hardware.print_debug_diagnostics(self)
-
- def sleep(self, sleeptime):
- Hardware.sleep(self, sleeptime)