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

Commit 7f373e0f authored by Brian Delwiche's avatar Brian Delwiche Committed by Automerger Merge Worker
Browse files

Merge "Encrypt LE link immediately on reconnection" into tm-dev am: 3e5357bb am: 04e5e220 

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



Change-Id: I1b535dc46a1acfc55aa46f47030949a99941d6b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87ea4b61 04e5e220

system/stack/acl/btm_acl.cc

+11 −0
Original line number Diff line number Diff line
@@ -1082,6 +1082,17 @@ void StackAclBtmAcl::btm_establish_continue(tACL_CONN* p_acl) { 
                PRIVATE_ADDRESS(p_acl->RemoteAddress()));

    }

    btm_set_link_policy(p_acl, btm_cb.acl_cb_.DefaultLinkPolicy());

  } else if (p_acl->is_transport_ble()) {

    tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_acl->remote_addr);



    if (p_dev_rec == nullptr) {

      LOG_WARN("No security record for %s",

               PRIVATE_ADDRESS(p_acl->RemoteAddress()));

    } else if (p_dev_rec->is_le_link_key_known()) {

      btm_ble_set_encryption(

          p_acl->remote_addr, BTM_BLE_SEC_ENCRYPT,

          p_dev_rec->role_central ? HCI_ROLE_CENTRAL : HCI_ROLE_PERIPHERAL);

    }

  }

  NotifyAclLinkUp(*p_acl);

}