From bc8c16c4129387b4a1c99b520f5ce5a38bb7ed90 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Sun, 23 Aug 2020 13:47:51 -0700 Subject: [PATCH] Use Api stack/acl/btm_acl::acl_disconnect Towards proper interfaces Bug: 163134718 Tag: #refactor Test: compile & verify basic functions working Change-Id: Ied740cc7d39d6b4a6492afe962b54e17da327607 --- stack/l2cap/l2c_csm.cc | 3 ++- stack/l2cap/l2c_link.cc | 3 ++- stack/l2cap/l2c_utils.cc | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stack/l2cap/l2c_csm.cc b/stack/l2cap/l2c_csm.cc index ff97360dd..0aa0af802 100644 --- a/stack/l2cap/l2c_csm.cc +++ b/stack/l2cap/l2c_csm.cc @@ -483,7 +483,8 @@ static void l2c_csm_term_w4_sec_comp(tL2C_CCB* p_ccb, uint16_t event, case L2CEVT_TIMEOUT: /* SM4 related. */ - btsnd_hcic_disconnect(p_ccb->p_lcb->handle, HCI_ERR_AUTH_FAILURE); + acl_disconnect(p_ccb->p_lcb->remote_bd_addr, p_ccb->p_lcb->transport, + HCI_ERR_AUTH_FAILURE); break; case L2CEVT_SEC_RE_SEND_CMD: /* BTM has enough info to proceed */ diff --git a/stack/l2cap/l2c_link.cc b/stack/l2cap/l2c_link.cc index 6e53fa598..a81df0d98 100644 --- a/stack/l2cap/l2c_link.cc +++ b/stack/l2cap/l2c_link.cc @@ -507,7 +507,8 @@ void l2c_link_timeout(tL2C_LCB* p_lcb) { /* BTM is still executing security process. Let lcb stay as connected */ start_timeout = false; } else if (p_lcb->IsBonding()) { - btsnd_hcic_disconnect(p_lcb->handle, HCI_ERR_PEER_USER); + acl_disconnect(p_lcb->remote_bd_addr, p_lcb->transport, + HCI_ERR_PEER_USER); l2cu_process_fixed_disc_cback(p_lcb); p_lcb->link_state = LST_DISCONNECTING; timeout_ms = L2CAP_LINK_DISCONNECT_TIMEOUT_MS; diff --git a/stack/l2cap/l2c_utils.cc b/stack/l2cap/l2c_utils.cc index f2f490e08..39c72c854 100644 --- a/stack/l2cap/l2c_utils.cc +++ b/stack/l2cap/l2c_utils.cc @@ -1447,7 +1447,8 @@ bool l2cu_start_post_bond_timer(uint16_t handle) { uint64_t timeout_ms = L2CAP_BONDING_TIMEOUT * 1000; if (p_lcb->idle_timeout == 0) { - btsnd_hcic_disconnect(p_lcb->handle, HCI_ERR_PEER_USER); + acl_disconnect(p_lcb->remote_bd_addr, p_lcb->transport, + HCI_ERR_PEER_USER); p_lcb->link_state = LST_DISCONNECTING; timeout_ms = L2CAP_LINK_DISCONNECT_TIMEOUT_MS; } @@ -2469,7 +2470,8 @@ void l2cu_no_dynamic_ccbs(tL2C_LCB* p_lcb) { p_lcb->link_state = LST_DISCONNECTING; start_timeout = false; } else if (p_lcb->IsBonding()) { - btsnd_hcic_disconnect(p_lcb->handle, HCI_ERR_PEER_USER); + acl_disconnect(p_lcb->remote_bd_addr, p_lcb->transport, + HCI_ERR_PEER_USER); l2cu_process_fixed_disc_cback(p_lcb); p_lcb->link_state = LST_DISCONNECTING; timeout_ms = L2CAP_LINK_DISCONNECT_TIMEOUT_MS; -- 2.11.0