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

Commit 524422fb authored by Bhakthavatsala Raghavendra's avatar Bhakthavatsala Raghavendra Committed by Automerger Merge Worker
Browse files

Merge "btm_sec: Don't trigger new authentication before collision timer... 

Merge "btm_sec: Don't trigger new authentication before collision timer expired" into main am: 3e61af78

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



Change-Id: I0ece09929eb3c7b216b57861536e6d0a3c0a7268
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52e6807f 3e61af78

system/stack/btm/btm_sec.cc

+8 −0
Original line number Diff line number Diff line
@@ -4513,6 +4513,14 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
    }



    if (start_auth) {

      if (com::android::bluetooth::flags::ignore_auth_req_when_collision_timer_active() &&

          alarm_is_scheduled(btm_sec_cb.sec_collision_timer) &&

          (btm_sec_cb.p_collided_dev_rec->bd_addr == p_dev_rec->bd_addr)) {

        log::debug(

                "Security Manager: Authentication will be executed after collision "

                "timer expired");

        return tBTM_STATUS::BTM_CMD_STARTED;

      }

      log::debug("Security Manager: Start authentication");



      /*