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

Commit ab3b2d64 authored by Archie Pusaka's avatar Archie Pusaka Committed by Gerrit Code Review
Browse files

Merge "Also check the peer's name when applying INTEROP_DELAY_AUTH" into main

parents e3e11fc8 781b6673

system/stack/btm/btm_sec.cc

+3 −1
Original line number Diff line number Diff line
@@ -4632,7 +4632,9 @@ static void btm_sec_wait_and_start_authentication(tBTM_SEC_DEV_REC* p_dev_rec) { 


  /* Overwrite the system-wide authentication delay if device-specific

   * interoperability delay is needed. */

  if (interop_match_addr(INTEROP_DELAY_AUTH, addr)) {

  if (interop_match_addr(INTEROP_DELAY_AUTH, addr) ||

      interop_match_name(INTEROP_DELAY_AUTH,

                         reinterpret_cast<char const*>(p_dev_rec->sec_bd_name))) {

    delay_auth = BTM_SEC_START_AUTH_DELAY;

  }