summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-03-16 14:01:31 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-03-16 14:01:31 -0700
commit9646d8df3719cdfa9c33ad7460f79a216f7098f8 (patch)
tree1b5248a51b94d08af1c6fc35056cf8078e3fdfa2
parentcde457831ca6912133a3737bcfaddccd27557d1d (diff)
parentd120465ceec97d2d2651c21341556d5856315409 (diff)
downloadandroid_system_bt-9646d8df3719cdfa9c33ad7460f79a216f7098f8.tar.gz
android_system_bt-9646d8df3719cdfa9c33ad7460f79a216f7098f8.tar.bz2
android_system_bt-9646d8df3719cdfa9c33ad7460f79a216f7098f8.zip
Merge "BT: ACL and l2c out if sync after connection collision"
-rw-r--r--stack/l2cap/l2c_link.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/stack/l2cap/l2c_link.c b/stack/l2cap/l2c_link.c
index 1432b1ae6..6e694d0f0 100644
--- a/stack/l2cap/l2c_link.c
+++ b/stack/l2cap/l2c_link.c
@@ -220,6 +220,13 @@ BOOLEAN l2c_link_hci_conn_comp (UINT8 status, UINT16 handle, BD_ADDR p_bda)
if (!p_lcb)
{
L2CAP_TRACE_WARNING ("L2CAP got conn_comp for unknown BD_ADDR");
+
+ /* Connection complete received when no link control block is present for this address
+ * However ACL entry is already created
+ * Removing connection entry at ACL and sending disconnect because l2c and acl are out of sync */
+ btm_remove_acl(p_bda, BT_TRANSPORT_BR_EDR);
+ btm_acl_removed(p_bda, BT_TRANSPORT_BR_EDR);
+
return (FALSE);
}