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

Commit 72f8d2dd authored by Myles Watson's avatar Myles Watson
Browse files

Use GD Controller for SupportsBle in btm_sec 

Bug: 321273521
Test: mma -j32
Flag: EXEMPT, no logical change
Ignore-AOSP-First: conflicts with security fix
Change-Id: I978970762691f078a5f7b754fb95b526854cb04d
parent f214c255

system/stack/btm/btm_sec.cc

+8 −4
Original line number Diff line number Diff line
@@ -3523,7 +3523,8 @@ void btm_sec_encryption_change_evt(uint16_t handle, tHCI_STATUS status, 
  if (IS_FLAG_ENABLED(bluffs_mitigation)) {

    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)) {

      if (status == HCI_ERR_CONNECTION_TOUT) {

        smp_cancel_start_encryption_attempt();

        return;
@@ -3544,10 +3545,12 @@ void btm_sec_encryption_change_evt(uint16_t handle, tHCI_STATUS status, 
    // flag off.  The entire block should be removed when the flag is.

    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;
@@ -4084,7 +4087,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 {