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

Commit 26b12e8e authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

Move BTM_SetLinkSuperTout from L2cap to ACL am: 7e896e4a 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1553576

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida11ed4187efa71809349f3a61e0e69f887640d3
parents 718d52ac 7e896e4a

system/stack/acl/btm_acl.cc

+1 −0
Original line number Diff line number Diff line
@@ -2678,6 +2678,7 @@ void on_acl_br_edr_connected(const RawAddress& bda, uint16_t handle, 
  btm_sec_connected(bda, handle, HCI_SUCCESS, enc_mode);

  btm_acl_set_paging(false);

  l2c_link_hci_conn_comp(HCI_SUCCESS, handle, bda);

  BTM_SetLinkSuperTout(bda, acl_get_link_supervision_timeout());



  tACL_CONN* p_acl = internal_.acl_get_connection_from_handle(handle);

  if (p_acl == nullptr) {

system/stack/l2cap/l2c_link.cc

+0 −4
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ extern tBTM_CB btm_cb; 


bool BTM_ReadPowerMode(const RawAddress& remote_bda, tBTM_PM_MODE* p_mode);

bool btm_dev_support_role_switch(const RawAddress& bd_addr);

tBTM_STATUS BTM_SetLinkSuperTout(const RawAddress& remote_bda,

                                 uint16_t timeout);

tBTM_STATUS btm_sec_disconnect(uint16_t handle, tHCI_STATUS reason);

tHCI_STATUS acl_get_disconnect_reason();

uint16_t acl_get_link_supervision_timeout();
@@ -188,8 +186,6 @@ void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle, 
    /* Get the peer information if the l2cap flow-control/rtrans is supported */

    l2cu_send_peer_info_req(p_lcb, L2CAP_EXTENDED_FEATURES_INFO_TYPE);



    BTM_SetLinkSuperTout(ci.bd_addr, acl_get_link_supervision_timeout());



    /* If dedicated bonding do not process any further */

    if (p_lcb->IsBonding()) {

      if (l2cu_start_post_bond_timer(handle)) return;