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

Commit c9d9b7e9 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Use GD Controller for SupportsBle in btm_sec" into main

parents 86e01041 d8b48c62

system/stack/btm/btm_sec.cc

+6 −3
Original line number Diff line number Diff line
@@ -3428,10 +3428,12 @@ void btm_sec_encryption_change_evt(uint16_t handle, tHCI_STATUS status, 
                                   uint8_t encr_enable) {

  if (status != HCI_SUCCESS || encr_enable == 0 ||

      BTM_IsBleConnection(handle) ||

      !controller_get_interface()->supports_read_encryption_key_size() ||

      !bluetooth::shim::GetController()->IsSupported(

          bluetooth::hci::OpCode::READ_ENCRYPTION_KEY_SIZE) ||

      // Skip encryption key size check when using set_min_encryption_key_size

      (bluetooth::common::init_flags::set_min_encryption_is_enabled() &&

       controller_get_interface()->supports_set_min_encryption_key_size())) {

       bluetooth::shim::GetController()->IsSupported(

           bluetooth::hci::OpCode::SET_MIN_ENCRYPTION_KEY_SIZE))) {

    if (status == HCI_ERR_CONNECTION_TOUT) {

      smp_cancel_start_encryption_attempt();

      return;
@@ -3971,7 +3973,8 @@ void btm_sec_encryption_key_refresh_complete(uint16_t handle, 
                                             tHCI_STATUS status) {

  if (status != HCI_SUCCESS || BTM_IsBleConnection(handle) ||

      // Skip encryption key size check when using set_min_encryption_key_size

      controller_get_interface()->supports_set_min_encryption_key_size()) {

      bluetooth::shim::GetController()->IsSupported(

          bluetooth::hci::OpCode::SET_MIN_ENCRYPTION_KEY_SIZE)) {

    btm_sec_encrypt_change(handle, static_cast<tHCI_STATUS>(status),

                           (status == HCI_SUCCESS) ? 1 : 0);

  } else {