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

Commit 4b776512 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove checks for BTM_BYPASS_EXTRA_ACL_SETUP 

It's never set, so always false

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I078dfb97421c30364750e70dda4b73b6dab36d1a
parent 7d5a2c04

system/stack/acl/btm_acl.cc

+0 −2
Original line number Diff line number Diff line
@@ -1082,7 +1082,6 @@ void btm_read_remote_ext_features_failed(uint8_t status, uint16_t handle) { 
 ******************************************************************************/

void btm_establish_continue(tACL_CONN* p_acl_cb) {

  BTM_TRACE_DEBUG("btm_establish_continue");

#if (BTM_BYPASS_EXTRA_ACL_SETUP == FALSE)

  if (p_acl_cb->transport == BT_TRANSPORT_BR_EDR) {

    /* For now there are a some devices that do not like sending */

    /* commands events and data at the same time. */
@@ -1093,7 +1092,6 @@ void btm_establish_continue(tACL_CONN* p_acl_cb) { 
      BTM_SetLinkPolicy(p_acl_cb->remote_addr,

                        &btm_cb.acl_cb_.btm_def_link_policy);

  }

#endif

  if (p_acl_cb->link_up_issued) {

    BTM_TRACE_ERROR("%s: Already link is up ", __func__);

    return;

system/stack/btm/btm_sec.cc

+0 −2
Original line number Diff line number Diff line
@@ -4022,7 +4022,6 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status, 
  /* set paging flag up */

/* whatever is in btm_establish_continue() without reporting the BTM_BL_CONN_EVT

 * event */

#if (BTM_BYPASS_EXTRA_ACL_SETUP == FALSE)

    /* For now there are a some devices that do not like sending */

    /* commands events and data at the same time. */

    /* Set the packet types to the default allowed by the device */
@@ -4031,7 +4030,6 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status, 


    if (btm_cb.acl_cb_.btm_def_link_policy)

      BTM_SetLinkPolicy(bda, &btm_cb.acl_cb_.btm_def_link_policy);

#endif



  btm_acl_created(bda, p_dev_rec->dev_class, p_dev_rec->sec_bd_name, handle,

                  HCI_ROLE_SLAVE, BT_TRANSPORT_BR_EDR);