diff --git a/system/gd/rust/common/src/init_flags.rs b/system/gd/rust/common/src/init_flags.rs index 49ed3349445b06f7b4970d737997729078387eb6..f92a353be7797412db9c1e8f29fa76aa09e231cb 100644 --- a/system/gd/rust/common/src/init_flags.rs +++ b/system/gd/rust/common/src/init_flags.rs @@ -362,7 +362,6 @@ init_flags!( asha_phy_update_retry_limit: i32 = 5, always_send_services_if_gatt_disc_done = true, always_use_private_gatt_for_debugging, - asynchronously_start_l2cap_coc = true, btaa_hci = true, bta_dm_clear_conn_id_on_client_close = true, btm_dm_flush_discovery_queue_on_search_cancel, diff --git a/system/gd/rust/shim/src/init_flags.rs b/system/gd/rust/shim/src/init_flags.rs index ffe11dc305428ab2b8b2dba612a456788f015070..2a4b30be2b1e13fdc24302e301d345deb89d515c 100644 --- a/system/gd/rust/shim/src/init_flags.rs +++ b/system/gd/rust/shim/src/init_flags.rs @@ -14,7 +14,6 @@ mod ffi { fn always_send_services_if_gatt_disc_done_is_enabled() -> bool; fn always_use_private_gatt_for_debugging_is_enabled() -> bool; - fn asynchronously_start_l2cap_coc_is_enabled() -> bool; fn btaa_hci_is_enabled() -> bool; fn bta_dm_clear_conn_id_on_client_close_is_enabled() -> bool; fn delay_hidh_cleanup_until_hidh_ready_start_is_enabled() -> bool; diff --git a/system/stack/l2cap/l2c_api.cc b/system/stack/l2cap/l2c_api.cc index 809f9e6261449cee591e09ca280e1a90e846f42f..308c38ab66c31c8c93eeefcf06eb41617e4e7a47 100644 --- a/system/stack/l2cap/l2c_api.cc +++ b/system/stack/l2cap/l2c_api.cc @@ -598,14 +598,9 @@ uint16_t L2CA_ConnectLECocReq(uint16_t psm, const RawAddress& p_bd_addr, L2CAP_TRACE_DEBUG("%s LE Link is up", __func__); // post this asynchronously to avoid out-of-order callback invocation // should this operation fail - if (bluetooth::common::init_flags:: - asynchronously_start_l2cap_coc_is_enabled()) { - do_in_main_thread( - FROM_HERE, base::BindOnce(&l2c_csm_execute, base::Unretained(p_ccb), - L2CEVT_L2CA_CONNECT_REQ, nullptr)); - } else { - l2c_csm_execute(p_ccb, L2CEVT_L2CA_CONNECT_REQ, NULL); - } + do_in_main_thread( + FROM_HERE, base::BindOnce(&l2c_csm_execute, base::Unretained(p_ccb), + L2CEVT_L2CA_CONNECT_REQ, nullptr)); } } @@ -892,7 +887,7 @@ std::vector<uint16_t> L2CA_ConnectCreditBasedReq(uint16_t psm, * Description Start reconfigure procedure on Connection Oriented Channel. * * Parameters: Vector of channels for which configuration should be - *changed New local channel configuration + * changed to new local channel configuration * * Return value: true if peer is connected *