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

Commit fc5f8271 authored by Calvin On's avatar Calvin On Committed by Md Shahriar Hossain Sajib
Browse files

Don't start peer authentication when peer device already started it. 

Bug: 199827901
Tag: #stability
Test: manually test

(cherry picked from commit Icb7341c7fdceea0591d5586f0dcffee3e6c3940d)
Change-Id: I67428bb0f4ae0eec661999854bcb07d40bba1abd
parent cd80e205

system/internal_include/bt_target.h

+4 −0
Original line number Diff line number Diff line
@@ -1053,4 +1053,8 @@ 
#define BTM_DELAY_AUTH_MS 0

#endif



#ifndef BTM_DISABLE_CONCURRENT_PEER_AUTH

#define BTM_DISABLE_CONCURRENT_PEER_AUTH FALSE

#endif



#endif /* BT_TARGET_H */

system/stack/btm/btm_sec.cc

+9 −0
Original line number Diff line number Diff line
@@ -3321,6 +3321,11 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS 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);

#ifdef BTM_DISABLE_CONCURRENT_PEER_AUTH

    } else if (BTM_DISABLE_CONCURRENT_PEER_AUTH &&

               p_dev_rec->sec_state == BTM_SEC_STATE_AUTHENTICATING) {

      p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;

#endif

    }

    return;

  }
@@ -3924,6 +3929,10 @@ void btm_sec_link_key_request(uint8_t* p_event) { 
  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_or_alloc_dev(bda);



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

#if (defined(BTM_DISABLE_CONCURRENT_PEER_AUTH) && \

     (BTM_DISABLE_CONCURRENT_PEER_AUTH == TRUE))

  p_dev_rec->sec_state = BTM_SEC_STATE_AUTHENTICATING;

#endif



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

      (btm_cb.collision_start_time != 0) &&