commit 7c858f2ae4786097be4d4df5259f4e79b70c4b0c
author Michael Butler <butlermichael@google.com> Fri Feb 18 21:45:11 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 18 21:45:11 2022 +0000
tree 9a1fe8c0104d3e64f1909a7876b9dd399d83326c
parent 381b56aed2a9ddf53b2fce9bb8252d5571df2c84
parent 3d9540d5ed10d6af34b95aa28a74252380895f4a

Merge "Remove isUpdatable query from NNAPI -- hal" am: 82d36078b9 am: 3d9540d5ed

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

Change-Id: Iadf47d5d0e056b4a58314c05f1fe67b467b7a1c3

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">