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

Commit f3272f4c authored by Christine Hallstrom's avatar Christine Hallstrom
Browse files

Revert "[RESTRICT AUTOMERGE] Reduce behavior change with LE ACL timeout on T" 

This reverts commit 72689620.

Reason for revert: Reverting from AOSP since change was not planned to merge as it did (see commit message from original change).

Change-Id: I3ed153ef0239bcfbaaaf62c0197e583888dc32df
Bug: 290844061
parent e5150ed3

system/stack/l2cap/l2c_utils.cc

100644 → 100755
+3 −10
Original line number Diff line number Diff line
@@ -2732,17 +2732,10 @@ 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.



  // FOR T ONLY: We add the outer safety-check to only do this for LE/ATT, to

  // minimize behavioral changes outside a dessert release. But for consistency

  // this should happen throughout on U (i.e. for classic transport + other

  // fixed channels too)

  if (p_lcb->p_fixed_ccbs[L2CAP_ATT_CID - L2CAP_FIRST_FIXED_CHNL] != NULL) {

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

      !p_lcb->with_active_local_clients) {

    return;

  }

  }



  if (timeout_ms == 0) {

    L2CAP_TRACE_DEBUG(