diff options
Diffstat (limited to 'bluetooth')
| -rw-r--r-- | bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml | 6 | ||||
| -rw-r--r-- | bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml index ea7adc9159..6010c60e97 100644 --- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml +++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml @@ -24,8 +24,10 @@ <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="run-command" value="cmd bluetooth_manager disable" /> + <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" /> + <option name="teardown-command" value="cmd bluetooth_manager enable" /> + <option name="teardown-command" value="cmd bluetooth_manager wait-for-state:STATE_ON" /> <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" /> </target_preparer> diff --git a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml index d64751a119..0234dc8a37 100644 --- a/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml +++ b/bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml @@ -20,8 +20,13 @@ <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="cmd bluetooth_manager disable" /> + <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" /> + <option name="teardown-command" value="cmd bluetooth_manager enable" /> + <option name="teardown-command" value="cmd bluetooth_manager wait-for-state:STATE_ON" /> + <option name="teardown-command" value="settings put global ble_scan_always_enabled 1" /> </target_preparer> <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer"> |