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

Commit 27afa204 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Remove btm_ble_set_random_address am: d3b07a15 

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

Change-Id: I67cb26a5496f260df185d8b87eb3bd8e429bd1fd
parents 030a4619 d3b07a15

system/stack/btm/btm_ble.cc

+0 −26
Original line number Diff line number Diff line
@@ -2073,32 +2073,6 @@ void btm_ble_reset_id(void) { 
  }));

}



/* This function set a random address to local controller. It also temporarily

 * disable scans and adv before sending the command to the controller. */

void btm_ble_set_random_address(const RawAddress& random_bda) {

  tBTM_LE_RANDOM_CB* p_cb = &btm_cb.ble_ctr_cb.addr_mgnt_cb;

  tBTM_BLE_CB* p_ble_cb = &btm_cb.ble_ctr_cb;

  const bool adv_mode = btm_cb.ble_ctr_cb.inq_var.adv_mode;



  if (adv_mode == BTM_BLE_ADV_ENABLE)

    btsnd_hcic_ble_set_adv_enable(BTM_BLE_ADV_DISABLE);

  if (p_ble_cb->is_ble_scan_active()) {

    btm_ble_stop_scan();

  }

  btm_ble_suspend_bg_conn();



  p_cb->private_addr = random_bda;

  btsnd_hcic_ble_set_random_addr(p_cb->private_addr);

  LOG_DEBUG("Updating local random address:%s", PRIVATE_ADDRESS(random_bda));



  if (adv_mode == BTM_BLE_ADV_ENABLE)

    btsnd_hcic_ble_set_adv_enable(BTM_BLE_ADV_ENABLE);

  if (p_ble_cb->is_ble_scan_active()) {

    btm_ble_start_scan();

  }

  btm_ble_resume_bg_conn();

}



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

 *

 * Function         btm_ble_get_acl_remote_addr

system/stack/btm/btm_ble_addr.cc

+0 −2
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ 


extern tBTM_CB btm_cb;



void btm_ble_set_random_address(const RawAddress& random_bda);



/* This function generates Resolvable Private Address (RPA) from Identity

 * Resolving Key |irk| and |random|*/

static RawAddress generate_rpa_from_irk_and_rand(const Octet16& irk,

system/stack/btm/btm_ble_int.h

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ extern void btm_ble_adv_filter_init(void); 
extern bool btm_ble_topology_check(tBTM_BLE_STATE_MASK request);

extern bool btm_ble_clear_topology_mask(tBTM_BLE_STATE_MASK request_state);

extern bool btm_ble_set_topology_mask(tBTM_BLE_STATE_MASK request_state);

extern void btm_ble_set_random_address(const RawAddress& random_bda);



extern void btm_ble_scanner_init(void);

extern void btm_ble_scanner_cleanup(void);

system/test/mock/mock_stack_btm_ble.cc

+0 −3
Original line number Diff line number Diff line
@@ -230,9 +230,6 @@ void btm_ble_rand_enc_complete(uint8_t* p, uint16_t op_code, 
                               tBTM_RAND_ENC_CB* p_enc_cplt_cback) {

  mock_function_count_map[__func__]++;

}

void btm_ble_set_random_address(const RawAddress& random_bda) {

  mock_function_count_map[__func__]++;

}

void btm_ble_test_command_complete(uint8_t* p) {

  mock_function_count_map[__func__]++;

}