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

Commit 00e963f2 authored by Michael Sun's avatar Michael Sun Committed by Gerrit Code Review
Browse files

Merge "Handle “already authenticated” with authentication race" into main

parents 13cfcb66 ec401373

system/stack/btm/btm_sec.cc

+4 −0
Original line number Diff line number Diff line
@@ -4665,6 +4665,10 @@ static void btm_sec_auth_timer_timeout(void* data) { 
    LOG_INFO("%s: invalid device or not found", __func__);

  } else if (btm_dev_authenticated(p_dev_rec)) {

    LOG_INFO("%s: device is already authenticated", __func__);

    if (p_dev_rec->p_callback) {

      (*p_dev_rec->p_callback)(&p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR,

                               p_dev_rec->p_ref_data, BTM_SUCCESS);

    }

  } else if (p_dev_rec->sec_state == BTM_SEC_STATE_AUTHENTICATING) {

    LOG_INFO("%s: device is in the process of authenticating", __func__);

  } else {