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

Commit 986e30c3 authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Gerrit Code Review
Browse files

Merge "Ignore additional encrypt change events when link is auth & encrypted"

parents 2988e56a 4b0308e5

system/stack/btm/btm_sec.cc

+7 −0
Original line number Diff line number Diff line
@@ -3289,6 +3289,13 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
  if (status == HCI_SUCCESS) {

    if (encr_enable) {

      if (p_dev_rec->hci_handle == handle) {  // classic

        if ((p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED) &&

            (p_dev_rec->sec_flags & BTM_SEC_ENCRYPTED)) {

          LOG_INFO(

              "Link is authenticated & encrypted, ignoring this enc change "

              "event");

          return;

        }

        p_dev_rec->sec_flags |= (BTM_SEC_AUTHENTICATED | BTM_SEC_ENCRYPTED);

        if (p_dev_rec->pin_code_length >= 16 ||

            p_dev_rec->link_key_type == BTM_LKEY_TYPE_AUTH_COMB ||