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

Commit b4aa5edd authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I022477af,I00828ed7 into main 

* changes:
  PairingTest: Add a test with ACL connection
  BTM_SEC: Change pairing state when ACL is already connected
parents 1305e517 0d8df7c6

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

+68 −5
Original line number Diff line number Diff line
@@ -170,11 +170,10 @@ public class PairingTest { 
     * <ol>

     *   <li>1. Bumble resets, enables inquiry and page scan, and sets I/O cap to no display no

     *       input

     *   <li>2. Android connects to Bumble via its MAC address

     *   <li>3. Android tries to create bond, emitting bonding intent 4. Android confirms the

     *       pairing via pairing request intent

     *   <li>5. Bumble confirms the pairing internally (optional, added only for test confirmation)

     *   <li>6. Android verifies bonded intent

     *   <li>2. Android tries to create bond via MAC address, emitting bonding intent

     *   <li>3. Android confirms the pairing via pairing request intent

     *   <li>4. Bumble confirms the pairing internally (optional, added only for test confirmation)

     *   <li>5. Android verifies bonded intent

     * </ol>

     */

    @Test
@@ -217,6 +216,70 @@ public class PairingTest { 
                BluetoothDevice.ACTION_BOND_STATE_CHANGED, BluetoothDevice.ACTION_PAIRING_REQUEST);

    }



    /**

     * Test a simple BR/EDR just works pairing flow in the follow steps:

     *

     * <ol>

     *   <li>1. Bumble resets, enables inquiry and page scan, and sets I/O cap to no display no

     *       input

     *   <li>2. Android connects to Bumble via its MAC address

     *   <li>3. Android tries to create bond, emitting bonding intent

     *   <li>4. Android confirms the pairing via pairing request intent

     *   <li>5. Bumble confirms the pairing internally (optional, added only for test confirmation)

     *   <li>6. Android verifies bonded intent

     * </ol>

     */

    @Test

    public void testBrEdrPairing_phoneInitiatedBrEdrInquiryOnlyJustWorksWhileSdpConnected() {

        registerIntentActions(

                BluetoothDevice.ACTION_ACL_CONNECTED,

                BluetoothDevice.ACTION_BOND_STATE_CHANGED,

                BluetoothDevice.ACTION_PAIRING_REQUEST);



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

        assertThat(mBumbleDevice.fetchUuidsWithSdp(BluetoothDevice.TRANSPORT_BREDR)).isTrue();



        verifyIntentReceived(

                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(

                hasAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED),

                hasExtra(BluetoothDevice.EXTRA_DEVICE, mBumbleDevice),

                hasExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_BONDING));



        verifyIntentReceived(

                hasAction(BluetoothDevice.ACTION_PAIRING_REQUEST),

                hasExtra(BluetoothDevice.EXTRA_DEVICE, mBumbleDevice),

                hasExtra(

                        BluetoothDevice.EXTRA_PAIRING_VARIANT,

                        BluetoothDevice.PAIRING_VARIANT_CONSENT));

        mBumbleDevice.setPairingConfirmation(true);



        PairingEvent pairingEvent = mPairingEventStreamObserver.iterator().next();

        assertThat(pairingEvent.hasJustWorks()).isTrue();

        pairingEventAnswerObserver.onNext(

                PairingEventAnswer.newBuilder().setEvent(pairingEvent).setConfirm(true).build());



        verifyIntentReceived(

                hasAction(BluetoothDevice.ACTION_BOND_STATE_CHANGED),

                hasExtra(BluetoothDevice.EXTRA_DEVICE, mBumbleDevice),

                hasExtra(BluetoothDevice.EXTRA_BOND_STATE, BluetoothDevice.BOND_BONDED));



        verifyNoMoreInteractions(mReceiver);



        unregisterIntentActions(

                BluetoothDevice.ACTION_ACL_CONNECTED,

                BluetoothDevice.ACTION_BOND_STATE_CHANGED,

                BluetoothDevice.ACTION_PAIRING_REQUEST);

    }



    /**

     * Test if parallel GATT service discovery interrupts cancelling LE pairing

     *

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -2111,11 +2111,11 @@ void btm_sec_abort_access_req(const RawAddress& bd_addr) { 
static tBTM_STATUS btm_sec_dd_create_conn(tBTM_SEC_DEV_REC* p_dev_rec) {

  tBTM_STATUS status = l2cu_ConnectAclForSecurity(p_dev_rec->bd_addr);

  if (status == BTM_CMD_STARTED) {

    btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);

    /* If already connected, start pending security procedure */

    if (BTM_IsAclConnectionUp(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR)) {

      return BTM_SUCCESS;

    }

    btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);

    return BTM_CMD_STARTED;

  } else if (status == BTM_NO_RESOURCES) {

    return BTM_NO_RESOURCES;