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

Commit de3f2a5f authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

resolve merge conflicts of bb92d796 to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icfc01cdf5b6c14711186b5412c996f66d9611373
parents ea539f5d bb92d796

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);