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

Commit 0ad49bdd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Don't start the authentication when peer device already started it"

parents 05b206d3 47881c73

system/stack/btm/btm_sec.cc

+3 −0
Original line number Diff line number Diff line
@@ -4046,6 +4046,8 @@ void btm_sec_encrypt_change(uint16_t handle, uint8_t status, 
                      __func__, p_dev_rec, p_dev_rec->p_callback);

      p_dev_rec->p_callback = NULL;

      l2cu_resubmit_pending_sec_req(&p_dev_rec->bd_addr);

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

      p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;

    }

    return;

  }
@@ -4700,6 +4702,7 @@ void btm_sec_link_key_request(const RawAddress& bda) { 
  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);



  VLOG(2) << __func__ << " bda: " << bda;

  p_dev_rec->sec_state = BTM_SEC_STATE_AUTHENTICATING;



  if ((btm_cb.pairing_state == BTM_PAIR_STATE_WAIT_PIN_REQ) &&

      (btm_cb.collision_start_time != 0) &&