From 94a3a178aae80ac581eb50f3e2b771698b7e099e Mon Sep 17 00:00:00 2001
From: Karthik Ramakrishnan <karthikmr@google.com>
Date: Mon, 7 Feb 2022 17:37:39 -0800
Subject: [PATCH] VtsHalBluetoothV1_0: Turn off/on BT for all users

Using the current user for the command to disable
BT before the test and enable after the test.
This ensures the proper command is used for
devices running in secondary user

Bug: 202873250
Bug: 226452499
Test: run vts -m VtsHalBluetoothV1_0TargetTest
          -t PerInstance/BluetoothHidlTest#InitializeAndClose/0_default
Change-Id: Ica83f4959a87b8fb498b535572738e4e790c6ddb
Merged-In: Ica83f4959a87b8fb498b535572738e4e790c6ddb
(cherry picked from commit 0dc66a2c69c6c06a504c9bef8b8418bc615d41dc)
---
 .../1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml
index 09463c962f..ea7adc9159 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">