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

Commit 0924b5b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sync wait for the bluetooth to be disabled / enabled" am: 3678f4f7 am: 54effb52 

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



Change-Id: I8fec5a5e1c1921ca58d1ed159c576dae3df86f1b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b62802c6 54effb52

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml

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

bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml

+4 −2
Original line number Diff line number Diff line
@@ -22,8 +22,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>