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

Commit f3cd05d1 authored by Hui Peng's avatar Hui Peng
Browse files

Backport "Enforce authentication if encryption is required" 

Original: ag/24706640

Bug: 294854926
Test: m com.android.btservices
Flag: EXEMPT backport
Merged-In: I0370ed2e3166d56f708e1981c2126526e1db9eaa
Change-Id: I0370ed2e3166d56f708e1981c2126526e1db9eaa
parent d753023a

system/stack/btm/btm_sec.cc

+6 −4
Original line number Diff line number Diff line
@@ -4517,13 +4517,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;

        }

      }