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

Commit 5ea14cac authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Reduce error conditions which cause link key deletion on auth complete"

parents b676bd6c 88ea8ee0

system/bta/dm/bta_dm_act.cc

+3 −4
Original line number Original line Diff line number Diff line
@@ -2588,10 +2588,9 @@ static uint8_t bta_dm_authentication_complete_cback( 
    if (bta_dm_cb.p_sec_cback)

    if (bta_dm_cb.p_sec_cback)

      bta_dm_cb.p_sec_cback(BTA_DM_AUTH_CMPL_EVT, &sec_event);

      bta_dm_cb.p_sec_cback(BTA_DM_AUTH_CMPL_EVT, &sec_event);





    if (result != HCI_ERR_LMP_RESPONSE_TIMEOUT &&

    if (result == HCI_ERR_AUTH_FAILURE || result == HCI_ERR_KEY_MISSING ||

        result != HCI_ERR_PAGE_TIMEOUT && result != HCI_ERR_CONNECTION_TOUT &&

        result == HCI_ERR_HOST_REJECT_SECURITY ||

        result != HCI_ERR_CONN_FAILED_ESTABLISHMENT &&

        result == HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE) {

        result != HCI_ERR_KEY_MISSING) {

      APPL_TRACE_WARNING("%s deleting %s - result: 0x%02x", __func__,

      APPL_TRACE_WARNING("%s deleting %s - result: 0x%02x", __func__,

                         bd_addr.ToString().c_str(), result);

                         bd_addr.ToString().c_str(), result);

      bta_dm_remove_sec_dev_entry(bd_addr);

      bta_dm_remove_sec_dev_entry(bd_addr);