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

Commit f6570910 authored by Aritra Sen's avatar Aritra Sen Committed by Automerger Merge Worker
Browse files

Merge "Remove 'queue_l2cap_coc_while_encrypting' flag since it has been... 

Merge "Remove 'queue_l2cap_coc_while_encrypting' flag since it has been enabled in prod bug-free since tm-qpr2-release." into main am: 3686407b

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



Change-Id: I53dd651f5b90151950c86c1977b8ad2864244109
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4832e302 3686407b

system/gd/rust/common/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -387,7 +387,6 @@ init_flags!( 
        pbap_pse_dynamic_version_upgrade = false,

        periodic_advertising_adi = true,

        private_gatt = true,

        queue_l2cap_coc_while_encrypting = true,

        redact_log = true,

        rust_event_loop = true,

        sco_codec_select_lc3,

system/gd/rust/shim/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ mod ffi { 
        fn pbap_pse_dynamic_version_upgrade_is_enabled() -> bool;

        fn periodic_advertising_adi_is_enabled() -> bool;

        fn private_gatt_is_enabled() -> bool;

        fn queue_l2cap_coc_while_encrypting_is_enabled() -> bool;

        fn redact_log_is_enabled() -> bool;

        fn rust_event_loop_is_enabled() -> bool;

        fn sco_codec_select_lc3_is_enabled() -> bool;

system/stack/btm/btm_ble.cc

+4 −10
Original line number Diff line number Diff line
@@ -992,17 +992,11 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 
      break;

  }



  if (ble_sec_act == BTM_BLE_SEC_NONE) {

    if (bluetooth::common::init_flags::queue_l2cap_coc_while_encrypting_is_enabled()) {

      if (sec_act != BTM_SEC_ENC_PENDING) {

  if (ble_sec_act == BTM_BLE_SEC_NONE && sec_act != BTM_SEC_ENC_PENDING) {

    return result;

  }

    } else {

      return result;

    }

  } else {



  l2cble_update_sec_act(bd_addr, sec_act);

  }



  BTM_SetEncryption(bd_addr, BT_TRANSPORT_LE, p_callback, p_ref_data,

                    ble_sec_act);