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

Commit 7bd53f7b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Consolidate bluetooth address variable" am: 58e885b2 am: 8d74c9cc... 

Merge "Consolidate bluetooth address variable" am: 58e885b2 am: 8d74c9cc am: 547882b5 am: 3a85ae73 am: 887c0586

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2150254



Change-Id: Ie7b53d652cdf23e19e1f666719bcd5c1d06d9432
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39893739 887c0586

system/btif/src/btif_dm.cc

+6 −6
Original line number Diff line number Diff line
@@ -2850,20 +2850,20 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 
    status = BT_STATUS_SUCCESS;

    state = BT_BOND_STATE_BONDED;

    tBLE_ADDR_TYPE addr_type;

    RawAddress bdaddr = p_auth_cmpl->bd_addr;

    if (btif_storage_get_remote_addr_type(&bdaddr, &addr_type) !=



    if (btif_storage_get_remote_addr_type(&bd_addr, &addr_type) !=

        BT_STATUS_SUCCESS)

      btif_storage_set_remote_addr_type(&bdaddr, p_auth_cmpl->addr_type);

      btif_storage_set_remote_addr_type(&bd_addr, p_auth_cmpl->addr_type);



    /* Test for temporary bonding */

    if (btm_get_bond_type_dev(p_auth_cmpl->bd_addr) ==

    if (btm_get_bond_type_dev(bd_addr) ==

        tBTM_SEC_DEV_REC::BOND_TYPE_TEMPORARY) {

      BTIF_TRACE_DEBUG("%s: sending BT_BOND_STATE_NONE for Temp pairing",

                       __func__);

      btif_storage_remove_bonded_device(&bdaddr);

      btif_storage_remove_bonded_device(&bd_addr);

      state = BT_BOND_STATE_NONE;

    } else {

      btif_dm_save_ble_bonding_keys(bdaddr);

      btif_dm_save_ble_bonding_keys(bd_addr);

      btif_dm_get_remote_services(bd_addr, BT_TRANSPORT_LE);

    }

  } else {