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

Commit 8d9c4497 authored by Archie Pusaka's avatar Archie Pusaka Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3428281



Change-Id: I0d5c94ac36cc6580f97a4a50be6ac6f7c4d9cac7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae6057eb ab3b2d64

system/stack/btm/btm_sec.cc

+3 −1
Original line number Original line 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

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

   * interoperability delay is needed. */

   * 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;

    delay_auth = BTM_SEC_START_AUTH_DELAY;

  }

  }