From cf52cb0307338b16307518bb111c555abe029ad5 Mon Sep 17 00:00:00 2001
From: Cheney Ni <cheneyni@google.com>
Date: Thu, 19 May 2022 10:08:06 +0800
Subject: [PATCH] VtsHalBluetoothV1_1: Turn off/on BT at
 RunCommandTargetPreparer

This change is cherry-picked from 0dc66a2c69 which
uses RunCommandTargetPreparer to turn off/on BT for
all users on VtsHalBluetoothV1_0.

Bug: 226452499
Test: run vts -m VtsHalBluetoothV1_1TargetTest
Change-Id: I5ef42c922a0b0a037d2cf70ca83790fc95196ccb
---
 .../1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml
index d64751a119..98b62ef0ac 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">