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

Commit 72a8ae06 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Jakub Pawłowski
Browse files

Fix state machine stuck after disconnection 

1. Connect on LE transport to dual mode device
2. Initiate pairing, control block will contain RPA as remote address
2. Obtain Identity Address, perform CTKD, generate Classic keys
3. Connect on Classic transport, start encryption
4. Encryption success, try reading the key size
5. Suddenly, connection times out, disconnection event is received

Current behavior:
Disconnection is not matched with the pairing device address.
We stay stuck in pairing state.

With fix:
We check if RPA from control block belongs to same device that
disconnected, and if so pass this event to state machine that would
clean up the control block.

Bug: 376306092
Bug: 369095269
Test: none
Flag: com.android.bluetooth.flags. smp_state_machine_stuck_after_disconnection_fix
Change-Id: I53bc0a4a8ac124dc20b4e9a1a30bb579653ef5a1
parent 2c41cfce

system/stack/smp/smp_l2c.cc

+13 −1
Original line number Diff line number Diff line
@@ -263,9 +263,21 @@ static void smp_br_connect_callback(uint16_t /* channel */, const RawAddress& bd 
  log::info("BDA:{} pairing_bda:{}, connected:{}", bd_addr, p_cb->pairing_bda, connected);



  if (bd_addr != p_cb->pairing_bda) {

    if (!com::android::bluetooth::flags::smp_state_machine_stuck_after_disconnection_fix()) {

      log::info(

              "If your pairing failed, get a build with "

              "smp_state_machine_stuck_after_disconnection_fix and try again :)");

      return;

    }



    tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

    /* When pairing was initiated to RPA, and connection was on LE transport first using RPA, then

     * we must check record pseudo address, it might be same device */

    if (p_dev_rec == nullptr || p_dev_rec->RemoteAddress() != p_cb->pairing_bda) {

      return;

    }

  }



  /* Check if we already finished SMP pairing over LE, and are waiting to

   * check if other side returns some errors. Connection/disconnection on

   * Classic transport shouldn't impact that.