commit d32c2f49796ef4645f42aa92aee33a070f0d9e3e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 18 04:57:32 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 18 04:57:32 2022 +0000
tree 542725abaef0575813df34c087588c01f40f6b69
parent 136142007d0c5aea4141f6808b7d244316e3023b
parent ff37dcdc9b446be98e76d7e7393a0acf5fe7faaf

Merge "broadcastradio 2.0: uses correct interface tag." am: bade4d7bd2 am: ff37dcdc9b

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1984587

Change-Id: Iec70f78d3de54a5d46fc24ecdf9ea73f9c7d2599

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml

diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
index 09463c9..ea7adc9 100644
--- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
+++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
@@ -22,8 +22,11 @@
     <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup">
     </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">