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

Commit c330d3d6 authored by Bidhya Sharma's avatar Bidhya Sharma Committed by Automerger Merge Worker
Browse files

Merge "Ignore additional encrypt change events when link is auth & encrypted" am: 986e30c3 

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



Change-Id: I059fcdf1d6b43ceded7c6740404061ff3c9456f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a45bb1a 986e30c3

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