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

Commit a0d29631 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

[21/24] Canonical form tBTM_STATUS::BTM_NOT_ENCRYPTED am: d6836f93 

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



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

system/stack/btm/btm_ble_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ tBTM_STATUS btm_ble_start_sec_check(const RawAddress& bd_addr, uint16_t psm, boo 
  if (!is_originator) {

    if ((p_serv_rec->security_flags & BTM_SEC_IN_ENCRYPT) && !is_encrypted) {

      log::error("BTM_NOT_ENCRYPTED. service security_flags=0x{:x}", p_serv_rec->security_flags);

      return BTM_NOT_ENCRYPTED;

      return tBTM_STATUS::BTM_NOT_ENCRYPTED;

    } else if ((p_serv_rec->security_flags & BTM_SEC_IN_AUTHENTICATE) &&

               !(is_link_key_authed || is_authenticated)) {

      log::error("tBTM_STATUS::BTM_NOT_AUTHENTICATED. service security_flags=0x{:x}",

system/stack/l2cap/l2c_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -1350,7 +1350,7 @@ tL2CAP_LE_RESULT_CODE l2ble_sec_access_req(const RawAddress& bd_addr, uint16_t p 
      return L2CAP_LE_RESULT_NO_PSM;

    case tBTM_STATUS::BTM_NOT_AUTHENTICATED:

      return L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION;

    case BTM_NOT_ENCRYPTED:

    case tBTM_STATUS::BTM_NOT_ENCRYPTED:

      return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP;

    case tBTM_STATUS::BTM_NOT_AUTHORIZED:

      return L2CAP_LE_RESULT_INSUFFICIENT_AUTHORIZATION;