Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970cccb9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "226452499" into android12-tests-dev 

* changes:
  VtsHalBluetoothV1_1: Turn off/on BT at RunCommandTargetPreparer
  VtsHalBluetoothV1_0: Turn off/on BT for all users
parents bd3d12a3 7dc143e5

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml

+5 −2
Original line number Diff line number Diff line
@@ -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">

bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml

+5 −2
Original line number Diff line number Diff line
@@ -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">