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

Commit 11e2e174 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes I078dfb97,Ia9594761 

* changes:
  Remove checks for BTM_BYPASS_EXTRA_ACL_SETUP
  Remove bta_dm_remove_all_acl (it's unused)
parents 1e06f158 4b776512

system/bta/dm/bta_dm_act.cc

+0 −21
Original line number Diff line number Diff line
@@ -736,27 +736,6 @@ void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev, 
  /* otherwise, no action needed */

}



// TODO: this is unused. remove?

/** This function forces to close all the ACL links specified by link type */

void bta_dm_remove_all_acl(const tBTA_DM_LINK_TYPE link_type) {

  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;



  APPL_TRACE_DEBUG("%s link type = %d", __func__, link_type);



  for (uint8_t i = 0; i < bta_dm_cb.device_list.count; i++) {

    transport = bta_dm_cb.device_list.peer_device[i].transport;

    if ((link_type == BTA_DM_LINK_TYPE_ALL) ||

        ((link_type == BTA_DM_LINK_TYPE_LE) &&

         (transport == BT_TRANSPORT_LE)) ||

        ((link_type == BTA_DM_LINK_TYPE_BR_EDR) &&

         (transport == BT_TRANSPORT_BR_EDR))) {

      /* Disconnect the ACL link */

      btm_remove_acl(bta_dm_cb.device_list.peer_device[i].peer_bdaddr,

                     transport);

    }

  }

}



/** Bonds with peer device */

void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                 tBTA_TRANSPORT transport, int device_type) {

system/bta/dm/bta_dm_int.h

+0 −2
Original line number Diff line number Diff line
@@ -545,6 +545,4 @@ extern tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device( 
    const RawAddress& peer_addr);



void bta_dm_eir_update_uuid(uint16_t uuid16, bool adding);



extern void bta_dm_remove_all_acl(const tBTA_DM_LINK_TYPE);

#endif /* BTA_DM_INT_H */

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);