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

Commit a1699381 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Enforce authentication if encryption is required am: 0a8c39cd am: b78a735e 

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



Change-Id: I7c10d1e2bffaa6855c289304496ab1175f59f013
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e19099a4 b78a735e

system/stack/btm/btm_sec.cc

+6 −4
Original line number Diff line number Diff line
@@ -4429,13 +4429,15 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
    // Check link status of BR/EDR

    if (!(p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED)) {

      if (p_dev_rec->IsLocallyInitiated()) {

        if (p_dev_rec->security_required & BTM_SEC_OUT_AUTHENTICATE) {

          LOG_DEBUG("Outgoing authentication Required");

        if (p_dev_rec->security_required &

            (BTM_SEC_OUT_AUTHENTICATE | BTM_SEC_OUT_ENCRYPT)) {

          LOG_DEBUG("Outgoing authentication/encryption Required");

          start_auth = true;

        }

      } else {

        if (p_dev_rec->security_required & BTM_SEC_IN_AUTHENTICATE) {

          LOG_DEBUG("Incoming authentication Required");

        if (p_dev_rec->security_required &

            (BTM_SEC_IN_AUTHENTICATE | BTM_SEC_IN_ENCRYPT)) {

          LOG_DEBUG("Incoming authentication/encryption Required");

          start_auth = true;

        }

      }