commit ace4b2577b90e60ca56a4a631465f503c102ad10
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 19 21:20:25 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 19 21:20:25 2022 +0000
tree dd5e9d16aa4b28fa0fe82997fb71c0228d0a5509
parent 40800aa0cbdd96bc4c28eebbe01b66a88e3bf69b
parent cf52cb0307338b16307518bb111c555abe029ad5

Merge "VtsHalBluetoothV1_1: Turn off/on BT at RunCommandTargetPreparer"

bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml

diff --git a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml
index d64751a..98b62ef 100644
--- a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml
+++ b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml
@@ -20,8 +20,11 @@
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
     </target_preparer>
 
-    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
-        <option name="bluetooth" value="off" />
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
+        <option name="run-command" value="su u$(am get-current-user)_system svc bluetooth disable" />
+        <option name="teardown-command" value="su u$(am get-current-user)_system svc bluetooth enable" />
+        <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">