From 49576764932e9203041d671bacc71fce21c399d4 Mon Sep 17 00:00:00 2001
From: Aritra Sen <aritrasen@google.com>
Date: Wed, 23 Aug 2023 09:00:42 +0000
Subject: [PATCH] Remove 'queue_l2cap_coc_while_encrypting' flag since it has
been enabled in prod bug-free since tm-qpr2-release.
Bug: 290845993
Tag: #stability
Test: m -j $(nproc) ; Android should build without the flag as well.
Change-Id: Icb19dfe9ca8d36bb9e95aeb477455adabc486e1c
---
system/gd/rust/common/src/init_flags.rs | 1 -
system/gd/rust/shim/src/init_flags.rs | 1 -
system/stack/btm/btm_ble.cc | 14 ++++----------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/system/gd/rust/common/src/init_flags.rs b/system/gd/rust/common/src/init_flags.rs
index 5d6ea21b697..090553620d6 100644
--- a/system/gd/rust/common/src/init_flags.rs
+++ b/system/gd/rust/common/src/init_flags.rs
@@ -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,
diff --git a/system/gd/rust/shim/src/init_flags.rs b/system/gd/rust/shim/src/init_flags.rs
index e40fdd59f29..39abff29512 100644
--- a/system/gd/rust/shim/src/init_flags.rs
+++ b/system/gd/rust/shim/src/init_flags.rs
@@ -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;
diff --git a/system/stack/btm/btm_ble.cc b/system/stack/btm/btm_ble.cc
index f0b145767ef..82fe486b986 100644
--- a/system/stack/btm/btm_ble.cc
+++ b/system/stack/btm/btm_ble.cc
@@ -991,18 +991,12 @@ 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) {
- return result;
- }
- } else {
- return result;
- }
- } else {
- l2cble_update_sec_act(bd_addr, sec_act);
+ if (ble_sec_act == BTM_BLE_SEC_NONE && sec_act != BTM_SEC_ENC_PENDING) {
+ return result;
}
+ l2cble_update_sec_act(bd_addr, sec_act);
+
BTM_SetEncryption(bd_addr, BT_TRANSPORT_LE, p_callback, p_ref_data,
ble_sec_act);
--
GitLab