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

Commit 98132332 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Fix unexpected pairing failures after CTKD" into main am: 7243f834 

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



Change-Id: I0b60d2c8d40701eb6069ea20f85e4f59e756a409
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bc9d2bc 7243f834

system/stack/smp/smp_l2c.cc

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ static void smp_br_connect_callback(uint16_t channel, const RawAddress& bd_addr, 
   * Classic transport shouldn't impact that.

   */

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda);

  if (smp_get_state() == SMP_STATE_BOND_PENDING &&

  if ((smp_get_state() == SMP_STATE_BOND_PENDING ||

       smp_get_state() == SMP_STATE_IDLE) &&

      (p_dev_rec && p_dev_rec->is_link_key_known()) &&

      alarm_is_scheduled(p_cb->delayed_auth_timer_ent)) {

    /* If we were to not return here, we would reset SMP control block, and