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

Commit 2f26458a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Use proper types BD_NAME => BTM_BT_NAME am: d245d784 

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

Change-Id: I4422eadca519cd1a2cbb5f762fe1c539eaa48716
parents 9bd4b69c d245d784

system/bta/dm/bta_dm_act.cc

+12 −10
Original line number Diff line number Diff line
@@ -72,19 +72,21 @@ static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, const uint8_t* p_eir, 
                                  uint16_t eir_len);

static void bta_dm_inq_cmpl_cb(void* p_result);

static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                DEV_CLASS dc, BD_NAME bd_name);

                                                DEV_CLASS dc,

                                                tBTM_BD_NAME bd_name);

static void bta_dm_remname_cback(void* p);

static void bta_dm_find_services(const RawAddress& bd_addr);

static void bta_dm_discover_next_device(void);

static void bta_dm_sdp_callback(tSDP_STATUS sdp_status);

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                const BD_NAME bd_name, bool min_16_digit);

                                const tBTM_BD_NAME bd_name, bool min_16_digit);

static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

                                         DEV_CLASS dev_class, BD_NAME bd_name,

                                         DEV_CLASS dev_class,

                                         tBTM_BD_NAME bd_name,

                                         const LinkKey& key, uint8_t key_type);

static void bta_dm_authentication_complete_cback(const RawAddress& bd_addr,

                                                 DEV_CLASS dev_class,

                                                 BD_NAME bd_name,

                                                 tBTM_BD_NAME bd_name,

                                                 tHCI_REASON result);

static void bta_dm_local_name_cback(void* p_name);

static void bta_dm_check_av();
@@ -1867,7 +1869,7 @@ static void bta_dm_inq_cmpl_cb(void* p_result) { 
 ******************************************************************************/

static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                UNUSED_ATTR DEV_CLASS dc,

                                                BD_NAME bd_name) {

                                                tBTM_BD_NAME bd_name) {

  tBTM_REMOTE_DEV_NAME rem_name;

  tBTM_STATUS btm_status;
@@ -2018,7 +2020,7 @@ static void bta_dm_pinname_cback(void* p_data) { 
 *

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

static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,

                                const BD_NAME bd_name, bool min_16_digit) {

                                const tBTM_BD_NAME bd_name, bool min_16_digit) {

  if (!bta_dm_cb.p_sec_cback) return BTM_NOT_AUTHORIZED;



  /* If the device name is not known, save bdaddr and devclass and initiate a
@@ -2057,8 +2059,8 @@ static uint8_t bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class, 
 ******************************************************************************/

static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr,

                                         UNUSED_ATTR DEV_CLASS dev_class,

                                         BD_NAME bd_name, const LinkKey& key,

                                         uint8_t key_type) {

                                         tBTM_BD_NAME bd_name,

                                         const LinkKey& key, uint8_t key_type) {

  tBTA_DM_SEC sec_event;

  tBTA_DM_AUTH_CMPL* p_auth_cmpl;

  tBTA_DM_SEC_EVT event = BTA_DM_AUTH_CMPL_EVT;
@@ -2102,8 +2104,8 @@ static uint8_t bta_dm_new_link_key_cback(const RawAddress& bd_addr, 
 *

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

static void bta_dm_authentication_complete_cback(

    const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class, BD_NAME bd_name,

    tHCI_REASON reason) {

    const RawAddress& bd_addr, UNUSED_ATTR DEV_CLASS dev_class,

    tBTM_BD_NAME bd_name, tHCI_REASON reason) {

  if (reason != HCI_SUCCESS) {

    if (bta_dm_cb.p_sec_cback) {

      // Build out the security event data structure