summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi <qijiang@google.com>2019-11-08 11:20:52 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-11-08 11:20:52 -0800
commitd6b59121f84beffbf91eccb4d37c88fc0ae435e3 (patch)
tree2de75aa3aa739176561bd75985f27fe59d31ae76
parent4a1948478f31e1e74f910b9d4595c0b43cb63bba (diff)
parent977e431809db3473a17e54ac6a3706522eb84074 (diff)
downloadplatform_tools_test_connectivity-d6b59121f84beffbf91eccb4d37c88fc0ae435e3.tar.gz
platform_tools_test_connectivity-d6b59121f84beffbf91eccb4d37c88fc0ae435e3.tar.bz2
platform_tools_test_connectivity-d6b59121f84beffbf91eccb4d37c88fc0ae435e3.zip
Merge "Minor changes to the BT power calibration test" am: b95e0964f2
am: 977e431809 Change-Id: I9e6d35217ff455d4bb30e8649853037f0b8b3c80
-rw-r--r--acts/framework/acts/test_utils/bt/bt_test_utils.py4
-rw-r--r--acts/tests/google/power/bt/PowerBTcalibrationTest.py3
2 files changed, 4 insertions, 3 deletions
diff --git a/acts/framework/acts/test_utils/bt/bt_test_utils.py b/acts/framework/acts/test_utils/bt/bt_test_utils.py
index c113f560d0..da4a88089f 100644
--- a/acts/framework/acts/test_utils/bt/bt_test_utils.py
+++ b/acts/framework/acts/test_utils/bt/bt_test_utils.py
@@ -768,8 +768,8 @@ def enable_bqr(ad_list, bqr_interval=10, bqr_event_mask=15,):
bqr_interval))
## Toggle airplane mode
- ad.droid.connectivityToggleAirplaneMode()
- ad.droid.connectivityToggleAirplaneMode()
+ ad.droid.connectivityToggleAirplaneMode(True)
+ ad.droid.connectivityToggleAirplaneMode(False)
def get_device_selector_dictionary(android_device_list):
diff --git a/acts/tests/google/power/bt/PowerBTcalibrationTest.py b/acts/tests/google/power/bt/PowerBTcalibrationTest.py
index 750268f35f..dffcc67231 100644
--- a/acts/tests/google/power/bt/PowerBTcalibrationTest.py
+++ b/acts/tests/google/power/bt/PowerBTcalibrationTest.py
@@ -29,10 +29,11 @@ class PowerBTcalibrationTest(PBtBT.PowerBTBaseTest):
super().setup_test()
self.attenuator = self.attenuators[0]
+ btutils.enable_bqr(self.dut)
+ btutils.enable_bluetooth(self.dut.droid, self.dut.ed)
btutils.connect_phone_to_headset(self.dut, self.bt_device, 60)
vol = self.dut.droid.getMaxMediaVolume() * self.volume
self.dut.droid.setMediaVolume(int(vol))
- btutils.enable_bqr(self.dut)
self.cal_data_path = os.path.join(self.log_path, 'Calibration')
self.log_file = os.path.join(self.cal_data_path, 'Cal_data.csv')