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

Commit 7ff2a998 authored by Sumit Deshmukh's avatar Sumit Deshmukh Committed by android-build-merger
Browse files

Merge "BLE: [IOT] Initiate disconnection when encryption fails during pairing" am: cd2fad66 

am: d2f63fd8

Change-Id: I59375ac3c155d1454bd0e610dff05bdb50a31148
parents 464047b2 d2f63fd8

system/stack/btm/btm_ble.cc

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

  if (p_dev_rec->p_callback && enc_cback) {

    if (encr_enable)

    if (encr_enable)

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_SUCCESS, true);

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_SUCCESS, true);

    else if (p_dev_rec->role_master)

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

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_PROCESSING, true);

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_PROCESSING, true);

  }

  }

  /* to notify GATT to send data if any request is pending */

  /* to notify GATT to send data if any request is pending */