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

Commit c9888511 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign2] Move a few ble addr APIs to btm_ble_addr.h" into main am:... 

Merge "[Invisalign2] Move a few ble addr APIs to btm_ble_addr.h" into main am: 1494d57c am: 2bdbf0b8

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



Change-Id: I58974c61177711d797fdce05024089cb77fd512b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86dc6773 2bdbf0b8

system/stack/acl/btm_ble_connection_establishment.cc

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

#include "stack/include/acl_api.h"

#include "stack/include/ble_hci_link_interface.h"

#include "stack/include/btm_ble_addr.h"

#include "types/raw_address.h"



extern tBTM_CB btm_cb;

system/stack/btm/btm_ble_gap.cc

+1 −5
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include "stack/include/bt_types.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_ble_addr.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/gap_api.h"

#include "stack/include/hci_error_code.h"
@@ -69,11 +70,6 @@ 
extern tBTM_CB btm_cb;



void btm_inq_remote_name_timer_timeout(void* data);

bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                              const RawAddress& new_pseudo_addr);

bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr,

                                        tBLE_ADDR_TYPE* p_addr_type,

                                        bool refresh);

void btm_ble_batchscan_init(void);

void btm_ble_adv_filter_init(void);

system/stack/btu/btu_hcif.cc

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

#include "stack/include/ble_hci_link_interface.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_ble_addr.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_iso_api.h"

#include "stack/include/dev_hci_link_interface.h"

system/stack/include/ble_hci_link_interface.h

+0 −9
Original line number Diff line number Diff line
@@ -19,11 +19,7 @@ 


#include <cstdint>



#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/hci_error_code.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"



// This header contains functions for HCI-ble to invoke

void btm_ble_process_adv_pkt(uint8_t len, const uint8_t* p);
@@ -35,11 +31,6 @@ void btm_ble_write_adv_enable_complete(uint8_t* p, uint16_t evt_len); 
void btm_ble_create_ll_conn_complete(tHCI_STATUS status);

void btm_ble_ltk_request(uint16_t handle, uint8_t rand[8], uint16_t ediv);

void btm_ble_test_command_complete(uint8_t* p);

bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr,

                                        tBLE_ADDR_TYPE* p_addr_type,

                                        bool refresh);

bool btm_identity_addr_to_random_pseudo_from_address_with_type(

    tBLE_BD_ADDR* address_with_type, bool refresh);

void btm_ble_read_resolving_list_entry_complete(const uint8_t* p,

                                                uint16_t evt_len);

void btm_ble_remove_resolving_list_entry_complete(uint8_t* p, uint16_t evt_len);

system/stack/include/btm_ble_addr.h

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at:

 *

 *  http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

 */



#pragma once



#include "stack/btm/security_device_record.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"



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

 *

 * Function         btm_ble_init_pseudo_addr

 *

 * Description      This function is used to initialize pseudo address.

 *                  If pseudo address is not available, use dummy address

 *

 * Returns          true is updated; false otherwise.

 *

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

bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                              const RawAddress& new_pseudo_addr);



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

 *

 * Function         btm_identity_addr_to_random_pseudo

 *

 * Description      This function map a static BD address to a pseudo random

 *                  address in security database.

 *

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

bool btm_identity_addr_to_random_pseudo(RawAddress* bd_addr,

                                        tBLE_ADDR_TYPE* p_addr_type,

                                        bool refresh);



bool btm_identity_addr_to_random_pseudo_from_address_with_type(

    tBLE_BD_ADDR* address_with_type, bool refresh);