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

Commit 6093a09a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Enforce stack/acl/btm_acl internal linkage am: a4f713d7 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1393564

Change-Id: Id8a9aa0f98ed3abc5128b0c3f923b81fbaffdbee
parents d2a17e38 a4f713d7

system/stack/acl/btm_acl.cc

+6 −5
Original line number Diff line number Diff line
@@ -56,23 +56,24 @@ tBTM_SEC_DEV_REC* btm_find_dev_by_handle(uint16_t handle); 
tBTM_SEC_DEV_REC* btm_find_or_alloc_dev(const RawAddress& bd_addr);

tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);

tBTM_STATUS btm_set_packet_types(tACL_CONN* p, uint16_t pkt_types);

void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p, uint16_t* p_pkt_type);

void btm_acl_update_busy_level(tBTM_BLI_EVENT event);

void btm_ble_refresh_local_resolvable_private_addr(

    const RawAddress& pseudo_addr, const RawAddress& local_rpa);

void btm_establish_continue(tACL_CONN* p_acl_cb);

void btm_read_automatic_flush_timeout_timeout(void* data);

void btm_read_failed_contact_counter_timeout(void* data);

void btm_read_rssi_timeout(void* data);

void btm_read_tx_power_timeout(void* data);

void btm_sec_dev_rec_cback_event(tBTM_SEC_DEV_REC* p_dev_rec, uint8_t res,

                                 bool is_le_trasnport);

void btm_sec_set_peer_sec_caps(tACL_CONN* p_acl_cb,

                               tBTM_SEC_DEV_REC* p_dev_rec);



static void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p,

                                              uint16_t* p_pkt_type);

static void btm_pm_sm_alloc(uint8_t ind);

static void btm_read_automatic_flush_timeout_timeout(void* data);

static void btm_read_failed_contact_counter_timeout(void* data);

static void btm_read_remote_features(uint16_t handle);

static void btm_read_remote_ext_features(uint16_t handle, uint8_t page_number);

static void btm_read_rssi_timeout(void* data);

static void btm_read_tx_power_timeout(void* data);

static void btm_process_remote_ext_features(tACL_CONN* p_acl_cb,

                                            uint8_t num_read_pages);

system/stack/btm/btm_int.h

+0 −6
Original line number Diff line number Diff line
@@ -92,16 +92,12 @@ extern void btm_cont_rswitch(tACL_CONN* p, tBTM_SEC_DEV_REC* p_dev_rec, 


extern uint8_t btm_handle_to_acl_index(uint16_t hci_handle);



extern void btm_read_rssi_timeout(void* data);

extern void btm_read_rssi_complete(uint8_t* p);



extern void btm_read_failed_contact_counter_timeout(void* data);

extern void btm_read_failed_contact_counter_complete(uint8_t* p);



extern void btm_read_automatic_flush_timeout_timeout(void* data);

extern void btm_read_automatic_flush_timeout_complete(uint8_t* p);



extern void btm_read_tx_power_timeout(void* data);

extern void btm_read_tx_power_complete(uint8_t* p, bool is_ble);



extern void btm_read_link_quality_complete(uint8_t* p);
@@ -123,8 +119,6 @@ extern void btm_read_remote_ext_features_failed(uint8_t status, 
extern void btm_read_remote_version_complete(uint8_t* p);

extern void btm_establish_continue(tACL_CONN* p_acl_cb);



extern void btm_acl_chk_peer_pkt_type_support(tACL_CONN* p,

                                              uint16_t* p_pkt_type);

extern tACL_CONN* btm_bda_to_acl(const RawAddress& bda,

                                 tBT_TRANSPORT transport);

extern bool btm_acl_notif_conn_collision(const RawAddress& bda);