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

Commit a71b5ad4 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] Move the following API to and ble privacy" into main

parents 4b5f84cc 0fb09320

system/stack/acl/ble_acl.cc

+8 −0
Original line number Diff line number Diff line
@@ -186,3 +186,11 @@ void acl_ble_data_length_change_event(uint16_t handle, uint16_t max_tx_octets, 
      handle, max_tx_octets, max_tx_time, max_rx_octets, max_rx_time);

  l2cble_process_data_length_change_event(handle, max_tx_octets, max_rx_octets);

}



uint64_t btm_get_next_private_addrress_interval_ms() {

  /* 7 minutes minimum, 15 minutes maximum for random address refreshing */

  const uint64_t interval_min_ms = (7 * 60 * 1000);

  const uint64_t interval_random_part_max_ms = (8 * 60 * 1000);



  return interval_min_ms + std::rand() % interval_random_part_max_ms;

}

system/stack/btm/btm_ble_addr.cc

+0 −8
Original line number Diff line number Diff line
@@ -90,14 +90,6 @@ void btm_gen_resolvable_private_addr( 
      std::move(cb)));

}



uint64_t btm_get_next_private_addrress_interval_ms() {

  /* 7 minutes minimum, 15 minutes maximum for random address refreshing */

  const uint64_t interval_min_ms = (7 * 60 * 1000);

  const uint64_t interval_random_part_max_ms = (8 * 60 * 1000);



  return interval_min_ms + std::rand() % interval_random_part_max_ms;

}



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

 *  Utility functions for Random address resolving

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

system/stack/btm/btm_ble_int.h

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ void btm_gen_resolvable_private_addr( 


tBTM_SEC_DEV_REC* btm_ble_resolve_random_addr(const RawAddress& random_bda);

void btm_gen_resolve_paddr_low(const RawAddress& address);

uint64_t btm_get_next_private_addrress_interval_ms();



void btm_ble_batchscan_init(void);

void btm_ble_adv_filter_init(void);

system/stack/include/btm_ble_privacy.h

+2 −0
Original line number Diff line number Diff line
@@ -32,3 +32,5 @@ bool btm_ble_addr_resolvable(const RawAddress& rpa, 


void btm_ble_resolving_list_load_dev(tBTM_SEC_DEV_REC& p_dev_rec);

void btm_ble_resolving_list_remove_dev(tBTM_SEC_DEV_REC* p_dev_rec);



uint64_t btm_get_next_private_addrress_interval_ms();

system/test/mock/mock_stack_btm_ble_addr.cc

+0 −7
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ namespace stack_btm_ble_addr { 
// Function state capture and return values, if needed

struct btm_gen_resolve_paddr_low btm_gen_resolve_paddr_low;

struct btm_gen_resolvable_private_addr btm_gen_resolvable_private_addr;

struct btm_get_next_private_addrress_interval_ms

    btm_get_next_private_addrress_interval_ms;

struct btm_ble_init_pseudo_addr btm_ble_init_pseudo_addr;

struct btm_ble_addr_resolvable btm_ble_addr_resolvable;

struct btm_ble_resolve_random_addr btm_ble_resolve_random_addr;
@@ -65,11 +63,6 @@ void btm_gen_resolvable_private_addr( 
  inc_func_call_count(__func__);

  test::mock::stack_btm_ble_addr::btm_gen_resolvable_private_addr(cb);

}

uint64_t btm_get_next_private_addrress_interval_ms() {

  inc_func_call_count(__func__);

  return test::mock::stack_btm_ble_addr::

      btm_get_next_private_addrress_interval_ms();

}

bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                              const RawAddress& new_pseudo_addr) {

  inc_func_call_count(__func__);