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

Commit da5854a1 authored by Chris Manton's avatar Chris Manton
Browse files

Const-ify stack::btm::BTM_SecReadDevName 

Bug: 187830698
Test: mma .

Change-Id: Idd065ac9820359eccb54318054d3fd392412693f
parent 9c72ad88

system/bta/dm/bta_dm_act.cc

+7 −8
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void bta_dm_disable_conn_down_timer_cback(void* data); 
void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id,

                     const RawAddress& peer_addr);

static void bta_dm_adjust_roles(bool delay_role_switch);

static char* bta_dm_get_remname(void);

static const char* bta_dm_get_remname(void);

static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result);



static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr,
@@ -873,7 +873,7 @@ void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type, 
            DeviceTypeText(device_type).c_str());



  tBTA_DM_SEC sec_event;

  char* p_name;

  const char* p_name;



  tBTM_STATUS status =

      BTM_SecBond(bd_addr, addr_type, transport, device_type, 0, NULL);
@@ -3160,14 +3160,13 @@ static void bta_dm_adjust_roles(bool delay_role_switch) { 
 *

 * Returns          char * - Pointer to the remote device name

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

static char* bta_dm_get_remname(void) {

  char* p_name = (char*)bta_dm_search_cb.peer_name;

  char* p_temp;

static const char* bta_dm_get_remname(void) {

  const char* p_name = (const char*)bta_dm_search_cb.peer_name;



  /* If the name isn't already stored, try retrieving from BTM */

  if (*p_name == '\0') {

    p_temp = BTM_SecReadDevName(bta_dm_search_cb.peer_bdaddr);

    if (p_temp != NULL) p_name = p_temp;

    const char* p_temp = BTM_SecReadDevName(bta_dm_search_cb.peer_bdaddr);

    if (p_temp != NULL) p_name = (const char*)p_temp;

  }



  return p_name;
@@ -3885,7 +3884,7 @@ static uint8_t bta_dm_ble_smp_cback(tBTM_LE_EVT event, const RawAddress& bda, 
                                    tBTM_LE_EVT_DATA* p_data) {

  tBTM_STATUS status = BTM_SUCCESS;

  tBTA_DM_SEC sec_event;

  char* p_name = NULL;

  const char* p_name = NULL;



  if (!bta_dm_cb.p_sec_cback) return BTM_NOT_AUTHORIZED;

system/stack/btm/btm_dev.cc

+4 −4
Original line number Diff line number Diff line
@@ -229,12 +229,12 @@ void BTM_SecClearSecurityFlags(const RawAddress& bd_addr) { 
 * Returns          Pointer to the name or NULL

 *

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

char* BTM_SecReadDevName(const RawAddress& bd_addr) {

  char* p_name = NULL;

  tBTM_SEC_DEV_REC* p_srec;

const char* BTM_SecReadDevName(const RawAddress& bd_addr) {

  const char* p_name = NULL;

  const tBTM_SEC_DEV_REC* p_srec;



  p_srec = btm_find_dev(bd_addr);

  if (p_srec != NULL) p_name = (char*)p_srec->sec_bd_name;

  if (p_srec != NULL) p_name = (const char*)p_srec->sec_bd_name;



  return (p_name);

}

system/stack/btm/btm_dev.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void BTM_SecClearSecurityFlags(const RawAddress& bd_addr); 
 * Returns          Pointer to the name or NULL

 *

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

char* BTM_SecReadDevName(const RawAddress& bd_addr);

const char* BTM_SecReadDevName(const RawAddress& bd_addr);



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

 *

system/stack/include/btm_client_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ struct btm_client_interface_t { 
    bool (*BTM_SecDeleteRmtNameNotifyCallbac)(

        tBTM_RMT_NAME_CALLBACK* p_callback);

    bool (*BTM_SecRegister)(const tBTM_APPL_INFO* p_cb_info);

    char* (*BTM_SecReadDevName)(const RawAddress& bd_addr);

    const char* (*BTM_SecReadDevName)(const RawAddress& bd_addr);

    tBTM_STATUS (*BTM_SecBond)(const RawAddress& bd_addr,

                               tBLE_ADDR_TYPE addr_type,

                               tBT_TRANSPORT transport,

system/stack/sdp/sdp_server.cc

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ static bool is_device_in_allowlist_for_pbap(RawAddress remote_address, 
        return true;

      }

    } else {

      char* p_name = BTM_SecReadDevName(remote_address);

      const char* p_name = BTM_SecReadDevName(remote_address);

      if ((p_name != NULL) &&

          interop_match_name(INTEROP_ADV_PBAP_VER_1_2, p_name)) {

        SDP_TRACE_DEBUG(