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

Commit 4d7082b2 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

btm_sec: Don't clear security record on encryption failed am: 264de23c 

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



Change-Id: Ied5e3ccc20aa48ff1469631fea7385010b4569ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76d7ca25 264de23c

system/stack/btm/btm_sec.cc

+8 −2
Original line number Diff line number Diff line
@@ -3374,9 +3374,15 @@ void btm_sec_encrypt_change(uint16_t handle, tHCI_STATUS status, 
  if (transport == BT_TRANSPORT_LE) {

    if (status == HCI_ERR_KEY_MISSING || status == HCI_ERR_AUTH_FAILURE ||

        status == HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE) {

      if (com::android::bluetooth::flags::

              sec_dont_clear_keys_on_encryption_err()) {

        log::error("{} encrypt failure status 0x{:x}", p_dev_rec->bd_addr,

                   status);

      } else {

        p_dev_rec->sec_rec.sec_flags &= ~(BTM_SEC_LE_LINK_KEY_KNOWN);

        p_dev_rec->sec_rec.ble_keys.key_type = BTM_LE_KEY_NONE;

      }

    }

    p_dev_rec->sec_rec.sec_status = status;

    btm_ble_link_encrypted(p_dev_rec->ble.pseudo_addr, encr_enable);