Initial strategy for emitting dex data section in startup order
Change-Id: Iddde05275d861cdce029cb597e60952231395bd4
diff --git a/tools/startup/adb_utils.py b/tools/startup/adb_utils.py
index 2530c29..b5e2af2 100644
--- a/tools/startup/adb_utils.py
+++ b/tools/startup/adb_utils.py
@@ -98,12 +98,12 @@
def ensure_screen_on(device_id=None):
if get_screen_state(device_id).is_off():
toggle_screen(device_id)
- assert adb_utils.get_screen_state(options.device_id).is_on()
+ assert get_screen_state(device_id).is_on()
def ensure_screen_off(device_id=None):
if get_screen_state(device_id).is_on():
toggle_screen(device_id)
- assert adb_utils.get_screen_state(options.device_id).is_off()
+ assert get_screen_state(device_id).is_off()
def force_compilation(app_id, device_id=None):
print('Applying AOT (full)')
diff --git a/tools/startup/measure_startup.py b/tools/startup/measure_startup.py
index 3a56bac..04076ec 100755
--- a/tools/startup/measure_startup.py
+++ b/tools/startup/measure_startup.py
@@ -100,6 +100,8 @@
time.sleep(options.cooldown)
teardown_options = adb_utils.prepare_for_interaction_with_device(
options.device_id, options.device_pin)
+ else:
+ teardown_options = None
# Prelaunch for hot startup.
if options.hot_startup:
