commit f11effe3ef4b0cf58bf63cecee6823d81a6f3da4
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 20 07:17:04 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 20 07:17:04 2017 +0000
tree d0ef4d1affbbafd6aa5d47e0f7beb9eadaf81b88
parent 7213872f9b421a2eb98be0a7aa5aa03d9930994c
parent 072ad83045e6fefd7ed57f4e2fe0754b9dc12d46

Snap for 4407597 from 072ad83045e6fefd7ed57f4e2fe0754b9dc12d46 to oc-mr1-release

Change-Id: Ib8c5670423dc7c697c71954e0e4c75a30539ccb5

acts/framework/acts/test_utils/bt/PowerBaseTest.py

diff --git a/acts/framework/acts/test_utils/bt/PowerBaseTest.py b/acts/framework/acts/test_utils/bt/PowerBaseTest.py
index 525317e..a175c9e 100644
--- a/acts/framework/acts/test_utils/bt/PowerBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/PowerBaseTest.py
@@ -56,6 +56,17 @@
                      "PMCMainActivity")
     PMC_VERBOSE_CMD = "setprop log.tag.PMC VERBOSE"
 
+    def setup_test(self):
+        self.timer_list = []
+        for a in self.android_devices:
+            a.ed.clear_all_events()
+            a.droid.setScreenTimeout(20)
+            self.ad.go_to_sleep()
+        return True
+
+    def teardown_test(self):
+        return True
+
     def setup_class(self):
         # Not to call Base class setup_class()
         # since it removes the bonded devices
@@ -85,8 +96,6 @@
         set_ambient_display(self.ad, False)
         self.ad.adb.shell("settings put system screen_brightness 0")
         set_auto_rotate(self.ad, False)
-        set_phone_screen_on(self.log, self.ad, self.SCREEN_TIME_OFF)
-        self.ad.go_to_sleep()
 
         wutils.wifi_toggle_state(self.ad, False)