Merge "Rollback the presetting change seems causing MH detect device failure"
diff --git a/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
index 1dc662b..0ede94e 100644
--- a/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
@@ -128,10 +128,9 @@
"""Prepares the device for power testing."""
self._factory_reset()
super()._prepare_device()
+ self.base_device_configuration()
self.log_in_gmail_account()
self._cut_band()
- self.base_device_configuration()
- time.sleep(DEFAULT_DEVICE_COOL_DOWN_TIME)
def _cleanup_device(self):
super()._cleanup_device()
@@ -217,7 +216,6 @@
def log_in_gmail_account(self, sync='false', wait_for_checkin='false'):
# Log in to gmail account
- self.ad_dut.adb.ensure_root()
self._install_google_account_util_apk()
time.sleep(DEFAULT_DEVICE_COOL_DOWN_TIME)
additional_setting = self._instrumentation_config.get_config('additional_setting')