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

Commit 781b6673 authored by Archie Pusaka's avatar Archie Pusaka Committed by Archie Pusaka
Browse files

Also check the peer's name when applying INTEROP_DELAY_AUTH 

It is reported on floss that some peer device consistently starting the
auth process about the same time as we also do, thus the two clashes
and it ended up in a failure.

Currently we have an interop in place but it only checks the address of
the peer. Our target peer device has quite a wide range of addresses
which is shared with a lot of non-target devices. Therefore, let's just
check the name as well to determine when to use the interop.

Bug: 382191454
Test: m -j
Flag: EXEMPT, trivial interop addition

Change-Id: I81d57fd17c9ba1f5ba40f93c72367bc9ffe9c1ff
parent 54edfd68

system/stack/btm/btm_sec.cc

+3 −1
Original line number Diff line number Diff line
@@ -4617,7 +4617,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;

  }