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

Commit 6ff145cd authored by Charlie Boutier's avatar Charlie Boutier Committed by Automerger Merge Worker
Browse files

Merge "ParingTests: Open OnPairing before any connections" into main am: dc7465ac am: 1ac1620e 

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



Change-Id: Ib95e47cc79e7f007085aae1232d84cefc43cc9b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa76e582 1ac1620e

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

+5 −4
Original line number Diff line number Diff line
@@ -236,6 +236,11 @@ public class PairingTest { 
                BluetoothDevice.ACTION_BOND_STATE_CHANGED,

                BluetoothDevice.ACTION_PAIRING_REQUEST);



        StreamObserver<PairingEventAnswer> pairingEventAnswerObserver =

                mBumble.security()

                        .withDeadlineAfter(BOND_INTENT_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS)

                        .onPairing(mPairingEventStreamObserver);



        // Start SDP.  This will create an ACL connection before the bonding starts.

        assertThat(mBumbleDevice.fetchUuidsWithSdp(BluetoothDevice.TRANSPORT_BREDR)).isTrue();
@@ -243,10 +248,6 @@ public class PairingTest { 
                hasAction(BluetoothDevice.ACTION_ACL_CONNECTED),

                hasExtra(BluetoothDevice.EXTRA_DEVICE, mBumbleDevice));



        StreamObserver<PairingEventAnswer> pairingEventAnswerObserver =

                mBumble.security()

                        .withDeadlineAfter(BOND_INTENT_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS)

                        .onPairing(mPairingEventStreamObserver);



        assertThat(mBumbleDevice.createBond()).isTrue();

        verifyIntentReceived(