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

Commit 30c76db5 authored by Christine Hallstrom's avatar Christine Hallstrom Committed by Gerrit Code Review
Browse files

Merge "Report SMP timeout during ctkd to java layer"

parents 46495382 c73bbcdb

system/btif/src/btif_dm.cc

+4 −2
Original line number Original line Diff line number Diff line
@@ -3363,7 +3363,7 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
        break;

        break;





      case BTA_DM_AUTH_SMP_CONN_TOUT: {

      case BTA_DM_AUTH_SMP_CONN_TOUT: {

        if (btm_sec_is_a_bonded_dev(bd_addr)) {

        if (!p_auth_cmpl->is_ctkd && btm_sec_is_a_bonded_dev(bd_addr)) {

          LOG(INFO) << __func__ << " Bonded device addr="

          LOG(INFO) << __func__ << " Bonded device addr="

                    << ADDRESS_TO_LOGGABLE_STR(bd_addr)

                    << ADDRESS_TO_LOGGABLE_STR(bd_addr)

                    << " timed out - will not remove the keys";

                    << " timed out - will not remove the keys";
@@ -3371,7 +3371,9 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
          // unbonded, and will disconnect HID profile.

          // unbonded, and will disconnect HID profile.

          return;

          return;

        }

        }



        LOG_INFO(

            "Removing ble bonding keys on SMP_CONN_TOUT during crosskey: %d",

            p_auth_cmpl->is_ctkd);

        btif_dm_remove_ble_bonding_keys();

        btif_dm_remove_ble_bonding_keys();

        status = BT_STATUS_AUTH_FAILURE;

        status = BT_STATUS_AUTH_FAILURE;

        break;

        break;