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

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

Merge "[Invisalign2] remove a few undefined functions in bta_dm_int.h" into... 

Merge "[Invisalign2] remove a few undefined functions in bta_dm_int.h" into main am: 7f6a1bf7 am: dde37b71 am: 4ccfba52

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



Change-Id: I1a8c5307f5bafe6c964d13e24c9cfe184249cc2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 57b0f506 4ccfba52

system/bta/dm/bta_dm_int.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -531,9 +531,6 @@ void bta_dm_ble_sirk_sec_cb_register(tBTA_DM_SEC_CBACK*); 
void bta_dm_ble_sirk_confirm_device_reply(const RawAddress& bd_addr,

void bta_dm_ble_sirk_confirm_device_reply(const RawAddress& bd_addr,

                                          bool accept);

                                          bool accept);

void bta_dm_set_dev_name(const std::vector<uint8_t>&);

void bta_dm_set_dev_name(const std::vector<uint8_t>&);

void bta_dm_set_visibility(tBTA_DM_DISC, tBTA_DM_CONN);

void bta_dm_set_scan_config(tBTA_DM_MSG* p_data);

void bta_dm_vendor_spec_command(tBTA_DM_MSG* p_data);

void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT,

void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT,

                 tBT_DEVICE_TYPE);

                 tBT_DEVICE_TYPE);

void bta_dm_bond_cancel(const RawAddress&);

void bta_dm_bond_cancel(const RawAddress&);
@@ -545,7 +542,6 @@ void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT); 
void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t,

void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t,

                          tHCI_STATUS);

                          tHCI_STATUS);

void bta_dm_pm_timer(const RawAddress&, tBTA_DM_PM_ACTION);

void bta_dm_pm_timer(const RawAddress&, tBTA_DM_PM_ACTION);

void bta_dm_add_ampkey(tBTA_DM_MSG* p_data);





void bta_dm_add_blekey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE blekey,

void bta_dm_add_blekey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE blekey,

                       tBTM_LE_KEY_TYPE key_type);

                       tBTM_LE_KEY_TYPE key_type);
@@ -577,7 +573,6 @@ void bta_dm_init_pm(void); 
void bta_dm_disable_pm(void);

void bta_dm_disable_pm(void);





uint8_t bta_dm_get_av_count(void);

uint8_t bta_dm_get_av_count(void);

void bta_dm_discovery_cmpl(tBTA_DM_MSG* p_data);

bool bta_dm_is_search_request_queued();

bool bta_dm_is_search_request_queued();

tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(const RawAddress& peer_addr);

tBTA_DM_PEER_DEVICE* bta_dm_find_peer_device(const RawAddress& peer_addr);