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

Commit 88ea8ee0 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Reduce error conditions which cause link key deletion on auth complete 

This inverts previous conditions which attempt to limit what error
conditions cause link key deletion and instead of excluding error codes
it provides a shorter list of codes which actually DO cause link key
deletion.

As a result, temporary failures caused by page timeouts, random
disconnects etc. should no longer cause link key deletion by accident.

Fixes: 63507123
Test: manual
Change-Id: I8d51403b8d233a3c335313b8f257a562c3d01109
parent 29ead9ab

system/bta/dm/bta_dm_act.cc

+3 −4
Original line number Diff line number Diff line
@@ -2588,10 +2588,9 @@ static uint8_t bta_dm_authentication_complete_cback( 
    if (bta_dm_cb.p_sec_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_CONNECTION_TOUT &&

        result != HCI_ERR_CONN_FAILED_ESTABLISHMENT &&

        result != HCI_ERR_KEY_MISSING) {

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

        result == HCI_ERR_HOST_REJECT_SECURITY ||

        result == HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE) {

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

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

      bta_dm_remove_sec_dev_entry(bd_addr);