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

Commit 457a61d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bt_SQ1A.220205.002" am: d2739627 am: 81c63b2b 

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

Change-Id: I06002873757f124253b495a3fbd6f670d276b98e
parents aadaf5c1 81c63b2b

system/bta/dm/bta_dm_act.cc

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "bta/dm/bta_dm_int.h"

#include "bta/gatt/bta_gattc_int.h"

#include "bta/include/bta_dm_ci.h"

#include "btif/include/btif_config.h"

#include "btif/include/btif_dm.h"

#include "btif/include/btif_storage.h"

#include "btif/include/stack_manager.h"
@@ -658,6 +659,13 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
  if (!other_address_connected && !other_address.IsEmpty()) {

    bta_dm_process_remove_device(other_address);

  }



  /* Check the length of the paired devices, and if 0 then reset IRK */

  auto paired_devices = btif_config_get_paired_devices();

  if (paired_devices.empty()) {

    LOG_INFO("Last paired device removed, resetting IRK");

    btm_ble_reset_id();

  }

}



/*******************************************************************************

system/test/mock/mock_stack_btm_ble.cc

+3 −0
Original line number Diff line number Diff line
@@ -252,3 +252,6 @@ void read_phy_cb( 
    uint8_t* data, uint16_t len) {

  mock_function_count_map[__func__]++;

}

void btm_ble_reset_id(void) {

  mock_function_count_map[__func__]++;

}