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

Commit 694d1a1b authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

DO NOT MERGE: Remove pairing on incoming bond request am: aa26eedc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/11934228

Change-Id: Icf0c4b744a56a06669fea1effd45c898063a4631
parents 8ab57b25 aa26eedc

system/stack/btm/btm_sec.cc

+9 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ extern fixed_queue_t* btu_general_alarm_queue; 
bool(APPL_AUTH_WRITE_EXCEPTION)(BD_ADDR bd_addr);

#endif



extern void bta_dm_process_remove_device(BD_ADDR bd_addr);



/*******************************************************************************

 *             L O C A L    F U N C T I O N     P R O T O T Y P E S            *

 ******************************************************************************/
@@ -3290,6 +3292,13 @@ void btm_io_capabilities_req(uint8_t* p) { 
  BTM_TRACE_EVENT("%s: State: %s", __func__,

                  btm_pair_state_descr(btm_cb.pairing_state));



  if (btm_sec_is_a_bonded_dev(evt_data.bd_addr)) {

    BTM_TRACE_WARNING(

        "%s: Incoming bond request, but device is already bonded (removing)",

        __func__);

    bta_dm_process_remove_device(evt_data.bd_addr);

  }



  p_dev_rec = btm_find_or_alloc_dev(evt_data.bd_addr);



  BTM_TRACE_DEBUG("%s:Security mode: %d, Num Read Remote Feat pages: %d",