From 985644c8ca2bc3d99fb37a46df2c7f615c58ae88 Mon Sep 17 00:00:00 2001 From: Andre Eisenbach Date: Tue, 18 Jul 2017 15:13:55 -0700 Subject: [PATCH] Do not delete pairing on HCI connection timeout Change-Id: I67121f3f6d34cd82e243af11ecd735684c4ca67d (cherry picked from commit f54d7e2719e36016f8dfa70757ae750909765776) Fixes: 63796670 Test: manual --- bta/dm/bta_dm_act.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc index 6faae8e3a..a215c49fa 100644 --- a/bta/dm/bta_dm_act.cc +++ b/bta/dm/bta_dm_act.cc @@ -38,6 +38,7 @@ #include "bta_dm_co.h" #include "bta_dm_int.h" #include "bta_sys.h" +#include "btcore/include/bdaddr.h" #include "btm_api.h" #include "btm_int.h" #include "btu.h" @@ -2612,9 +2613,14 @@ static uint8_t bta_dm_authentication_complete_cback( bta_dm_cb.p_sec_cback(BTA_DM_AUTH_CMPL_EVT, &sec_event); if (result != HCI_ERR_LMP_RESPONSE_TIMEOUT && - result != HCI_ERR_PAGE_TIMEOUT && + result != HCI_ERR_PAGE_TIMEOUT && result != HCI_ERR_CONNECTION_TOUT && result != HCI_ERR_CONN_FAILED_ESTABLISHMENT && result != HCI_ERR_KEY_MISSING) { + bdstr_t bd_addr_str; + APPL_TRACE_WARNING("%s deleting %s - result: 0x%02x", __func__, + bdaddr_to_string((bt_bdaddr_t*)bd_addr, bd_addr_str, + sizeof(bd_addr_str)), + result); bta_dm_remove_sec_dev_entry(bd_addr); } } -- 2.11.0