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

Commit 27e41538 authored by Christine Hallstrom's avatar Christine Hallstrom Committed by Automerger Merge Worker
Browse files

Merge "Clean up finite_att_timeout" into main am: ccc3bce6 am: 262b8618 

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



Change-Id: I26ec79bc387a01b989d3ca82cd05932c61bfc56b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6dacff71 262b8618

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

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ init_flags!( 
        delay_hidh_cleanup_until_hidh_ready_start = true,

        device_iot_config_logging,

        dynamic_avrcp_version_enhancement = true,

        finite_att_timeout = true,

        gatt_robust_caching_client = true,

        gatt_robust_caching_server,

        gd_core,

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

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

        fn device_iot_config_logging_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn finite_att_timeout_is_enabled() -> bool;

        fn gatt_robust_caching_client_is_enabled() -> bool;

        fn gatt_robust_caching_server_is_enabled() -> bool;

        fn gd_core_is_enabled() -> bool;

system/stack/gatt/gatt_main.cc

+2 −4
Original line number Diff line number Diff line
@@ -970,13 +970,11 @@ static void gatt_send_conn_cback(tGATT_TCB* p_tcb) { 
      GATT_SetIdleTimeout(p_tcb->peer_bda, GATT_LINK_NO_IDLE_TIMEOUT,

                          p_tcb->transport, true /* is_active */);

    } else {

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

      GATT_SetIdleTimeout(p_tcb->peer_bda, GATT_LINK_IDLE_TIMEOUT_WHEN_NO_APP,

                          p_tcb->transport, false /* is_active */);

    }

  }

}

}



void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa) {

  tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(rpa, BT_TRANSPORT_LE);

system/stack/l2cap/l2c_utils.cc

+1 −2
Original line number Diff line number Diff line
@@ -2732,8 +2732,7 @@ void l2cu_no_dynamic_ccbs(tL2C_LCB* p_lcb) { 
  // be in use even without a GATT client. We only timeout if either a dynamic

  // channel or a GATT client was used, since then we expect the client to

  // manage the lifecycle of the connection.

  if (bluetooth::common::init_flags::finite_att_timeout_is_enabled() &&

      !p_lcb->with_active_local_clients) {

  if (!p_lcb->with_active_local_clients) {

    return;

  }