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

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

Merge "Fix flakyness in PairingTest" into main am: f0e726dd 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3108577



Change-Id: If22b6acd251ae4a7ae5d8eeb4657a3babe48ae14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1dd4e47 f0e726dd

framework/tests/bumble/src/android/bluetooth/pairing/PairingTest.java

+2 −2
Original line number Diff line number Diff line
@@ -355,10 +355,10 @@ public class PairingTest { 
                        .next();



        // Todo: Unexpected empty ACTION_UUID intent is generated

        verifyIntentReceived(hasAction(BluetoothDevice.ACTION_UUID));

        verifyIntentReceivedUnordered(hasAction(BluetoothDevice.ACTION_UUID));



        // Wait for connection on Android

        verifyIntentReceived(

        verifyIntentReceivedUnordered(

                hasAction(BluetoothDevice.ACTION_ACL_CONNECTED),

                hasExtra(BluetoothDevice.EXTRA_TRANSPORT, BluetoothDevice.TRANSPORT_LE));