commit 9a39a1d98b8e2e9f3bc50e7dc0955c448ba697c1
author Andi Janti <ajanti@google.com> Fri Oct 20 00:51:34 2017 +0000
committer Andi Janti <ajanti@google.com> Fri Oct 20 01:24:40 2017 +0000
tree 2b2dc90b6c1fa8a05148043452856cce6db35fa4
parent 58b4f82963594cbe2130fc2d68e3954fb54d3506

Merge "force to use the phone screen timeout from here instead of using the default BluetoothBaseTest" am: d4a9e8eca9
am: 1e1888c3dc

Bug: 67754984
Test: manual run at AutoTest phones

Change-Id: Icd8fd775e5c83cfaccce92a9de4425c6d3b496d9
(cherry picked from commit 990f6d02ca08f9f42cd16b2b2bfa010bb377ec13)

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)