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

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

Merge "[Invisalign2] Separate btm_ble_addr API and ble privacy" into main

parents 1afdd3a9 9a15904c

system/stack/acl/ble_acl.cc

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "stack/gatt/connection_manager.h"

#include "stack/include/acl_api.h"

#include "stack/include/btm_ble_addr.h"

#include "stack/include/btm_ble_privacy.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "types/raw_address.h"

system/stack/btm/btm_ble_addr.cc

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#define LOG_TAG "ble"



#include "stack/include/btm_ble_addr.h"



#include <base/functional/bind.h>

#include <string.h>
@@ -35,6 +37,7 @@ 
#include "stack/crypto_toolbox/crypto_toolbox.h"

#include "stack/include/acl_api.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btm_ble_privacy.h"

#include "stack/include/btm_ble_sec_api.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"

system/stack/btm/btm_ble_gap.cc

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_ble_addr.h"

#include "stack/include/btm_ble_privacy.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/gap_api.h"

#include "stack/include/hci_error_code.h"

system/stack/btm/btm_ble_int.h

+0 −16
Original line number Diff line number Diff line
@@ -92,22 +92,6 @@ 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();



/*  privacy function */

/* BLE address mapping with CS feature */

bool btm_random_pseudo_to_identity_addr(RawAddress* random_pseudo,

                                        tBLE_ADDR_TYPE* p_identity_addr_type);

void btm_ble_refresh_peer_resolvable_private_addr(const RawAddress& pseudo_bda,

                                                  const RawAddress& rra,

                                                  tBLE_RAND_ADDR_TYPE type);

bool btm_ble_read_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec);



bool btm_ble_addr_resolvable(const RawAddress& rpa,

                             tBTM_SEC_DEV_REC* p_dev_rec);



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);

void btm_ble_resolving_list_init(uint8_t max_irk_list_sz);



void btm_ble_batchscan_init(void);

void btm_ble_adv_filter_init(void);

bool btm_ble_topology_check(tBTM_BLE_STATE_MASK request);

system/stack/btm/btm_ble_privacy.cc

+6 −3
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 ******************************************************************************/

#define LOG_TAG "ble_priv"



#include "stack/include/btm_ble_privacy.h"



#include "btm_dev.h"

#include "btm_sec_cb.h"

#include "btm_sec_int_types.h"
@@ -30,9 +32,9 @@ 
#include "main/shim/acl_api.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btm_api.h"

#include "types/raw_address.h"



extern tBTM_CB btm_cb;
@@ -431,7 +433,8 @@ static void btm_ble_resolving_list_vsc_op_cmpl(tBTM_VSC_CMPL* p_params) { 
 * Returns          status

 *

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

tBTM_STATUS btm_ble_remove_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec) {

static tBTM_STATUS btm_ble_remove_resolving_list_entry(

    tBTM_SEC_DEV_REC* p_dev_rec) {

  /* if controller does not support RPA offloading or privacy 1.2, skip */

  if (controller_get_interface()->get_ble_resolving_list_max_size() == 0)

    return BTM_WRONG_MODE;
@@ -465,7 +468,7 @@ tBTM_STATUS btm_ble_remove_resolving_list_entry(tBTM_SEC_DEV_REC* p_dev_rec) { 
 * Parameters       None.

 *

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

void btm_ble_clear_resolving_list(void) {

static void btm_ble_clear_resolving_list(void) {

  if (controller_get_interface()->supports_ble_privacy()) {

    bluetooth::shim::ACL_ClearAddressResolution();

  } else {