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

Commit 2065b7a5 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "1. Fixed a bug in the condition to check if cental know LE link key.... 

Merge "1. Fixed a bug in the condition to check if cental know LE link key. The intention of the code is to check if it has a LE link key, but only other bits are checked at now." into main am: e23be23e am: 0032db0d

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



Change-Id: I269a8fd3e124516f02d933bd22852f5e3be3dc31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e11ff09f 0032db0d

system/stack/btm/btm_ble.cc

+3 −3
Original line number Diff line number Diff line
@@ -1505,13 +1505,13 @@ void btm_ble_link_encrypted(const RawAddress& bd_addr, uint8_t encr_enable) { 
  if (p_dev_rec->p_callback && enc_cback) {

    if (encr_enable)

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_SUCCESS, true);

    else if (p_dev_rec->sec_flags & ~BTM_SEC_LE_LINK_KEY_KNOWN) {

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_FAILED_ON_SECURITY, true);

    }

    /* LTK missing on peripheral */

    else if (p_dev_rec->role_central && (p_dev_rec->sec_status == HCI_ERR_KEY_MISSING)) {

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_KEY_MISSING, true);

    }

    else if (!(p_dev_rec->sec_flags & BTM_SEC_LE_LINK_KEY_KNOWN)) {

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_FAILED_ON_SECURITY, true);

    }

    else if (p_dev_rec->role_central)

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_PROCESSING, true);

  }