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

Commit aa44480f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Const-ify BTM_SetLocalDeviceName"

parents 8205588c be9368be

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void bta_dm_wait_for_acl_to_drain_cback(void* data) { 


/** Sets local device name */

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

  BTM_SetLocalDeviceName((char*)name.data());

  BTM_SetLocalDeviceName((const char*)name.data());

  bta_dm_set_eir((char*)name.data());

}

system/main/shim/btm_api.h

+1 −1
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ bool BTM_IsDeviceUp(void); 
 * Returns          BTM_CMD_STARTED if successful, otherwise an error

 *

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

tBTM_STATUS BTM_SetLocalDeviceName(char* p_name);

tBTM_STATUS BTM_SetLocalDeviceName(const char* p_name);



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

 *

system/stack/btm/btm_devctl.cc

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static void decode_controller_support() { 
 * Returns          status of the operation

 *

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

tBTM_STATUS BTM_SetLocalDeviceName(char* p_name) {

tBTM_STATUS BTM_SetLocalDeviceName(const char* p_name) {

  uint8_t* p;



  if (!p_name || !p_name[0] || (strlen((char*)p_name) > BD_NAME_LEN))

system/stack/gap/gap_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ void GAP_BleAttrDBUpdate(uint16_t attr_uuid, tGAP_BLE_ATTR_VALUE* p_value) { 
          break;



        case GATT_UUID_GAP_DEVICE_NAME:

          BTM_SetLocalDeviceName((char*)p_value->p_dev_name);

          BTM_SetLocalDeviceName((const char*)p_value->p_dev_name);

          break;



        case GATT_UUID_GAP_CENTRAL_ADDR_RESOL:

system/stack/include/btm_api.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ bool BTM_IsDeviceUp(void); 
 * Returns          BTM_CMD_STARTED if successful, otherwise an error

 *

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

tBTM_STATUS BTM_SetLocalDeviceName(char* p_name);

tBTM_STATUS BTM_SetLocalDeviceName(const char* p_name);



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

 *