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

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

Merge "Rather than immediately removing classic device bond, send a broadcast"... 

Merge "Rather than immediately removing classic device bond, send a broadcast" into main am: 5e6bbde5 am: b1af8a67

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



Change-Id: I12c8bee5e06b9a2053cecdd267d1aaa0220d4cc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2283e456 b1af8a67

system/stack/btm/btm_sec.cc

+14 −0
Original line number Diff line number Diff line
@@ -2530,6 +2530,20 @@ void btm_sec_rmt_host_support_feat_evt(const RawAddress bd_addr, 
 ******************************************************************************/

void btm_io_capabilities_req(RawAddress p) {

  if (btm_sec_is_a_bonded_dev(p)) {

    if (com::android::bluetooth::flags::key_missing_classic_device()) {

      log::warn(

          "Incoming bond request, but {} is already bonded (notifying user)",

          p);

      bta_dm_remote_key_missing(p);



      auto p_dev_rec = btm_find_dev(p);

      if (p_dev_rec != NULL) {

        btm_sec_disconnect(p_dev_rec->hci_handle, HCI_ERR_AUTH_FAILURE,

                           "btm_io_capabilities_req Security failure");

      }

      return;

    }



    log::warn("Incoming bond request, but {} is already bonded (removing)", p);

    bta_dm_process_remove_device(p);

  }