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

Commit c7d9e3f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove 'asynchronously_start_l2cap_coc' flag since it has been enabled... 

Merge "Remove 'asynchronously_start_l2cap_coc' flag since it has been enabled in prod bug-free since tm-qpr2-release." into main am: 1434d775

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



Change-Id: I9b07f4a37f6fd9a94250039807be1b35ccab6a2a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6cd3006e 1434d775

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

+0 −1
Original line number Diff line number Diff line
@@ -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,

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

+0 −1
Original line number Diff line number Diff line
@@ -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;

system/stack/l2cap/l2c_api.cc

+4 −9
Original line number Diff line number Diff line
@@ -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);

      }

    }

  }
@@ -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

 *