From 19ef328f8ea356e7f75bb5bf09749f776e50dda8 Mon Sep 17 00:00:00 2001 From: baohongde Date: Tue, 22 Sep 2020 20:11:06 +0800 Subject: [PATCH] components/bt: Fix clear bond fail when connected without ble included --- components/bt/host/bluedroid/bta/dm/bta_dm_act.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c index 84defc5f10..a62d739382 100644 --- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c +++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c @@ -884,11 +884,14 @@ void bta_dm_remove_device(tBTA_DM_MSG *p_data) /* Take the link down first, and mark the device for removal when disconnected */ for (int i = 0; i < bta_dm_cb.device_list.count; i++) { if (!bdcmp(bta_dm_cb.device_list.peer_device[i].peer_bdaddr, p_dev->bd_addr) - && bta_dm_cb.device_list.peer_device[i].transport == transport) { +#if BLE_INCLUDED == TRUE + && bta_dm_cb.device_list.peer_device[i].transport == transport +#endif + ) { + bta_dm_cb.device_list.peer_device[i].conn_state = BTA_DM_UNPAIRING; - btm_remove_acl( p_dev->bd_addr, bta_dm_cb.device_list.peer_device[i].transport); - APPL_TRACE_DEBUG("%s:transport = %d", __func__, - bta_dm_cb.device_list.peer_device[i].transport); + btm_remove_acl( p_dev->bd_addr, transport); + APPL_TRACE_DEBUG("%s:transport = %d", __func__, transport); break; } }