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

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

Merge "legacy: const-ify BTM_ReadLocalDeviceName" am: 53f20420 

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

Change-Id: Id278ee4c790f1b6ba2728e4c0f80b4bf2b7baeeb
parents 0cea41d8 53f20420

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2880,7 +2880,7 @@ static void bta_dm_set_eir(char* local_name) { 
#if (BTA_EIR_CANNED_UUID_LIST != TRUE)

  /* if local name is not provided, get it from controller */

  if (local_name == NULL) {

    if (BTM_ReadLocalDeviceName(&local_name) != BTM_SUCCESS) {

    if (BTM_ReadLocalDeviceName((const char**)&local_name) != BTM_SUCCESS) {

      APPL_TRACE_ERROR("Fail to read local device name for EIR");

    }

  }

system/btif/src/bluetooth.cc

+1 −1
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ void invoke_oob_data_request_cb(tBT_TRANSPORT t, bool valid, Octet16 c, 
                                uint8_t address_type) {

  LOG_INFO("%s", __func__);

  bt_oob_data_t oob_data = {};

  char* local_name;

  const char* local_name;

  BTM_ReadLocalDeviceName(&local_name);

  for (int i = 0; i < BTM_MAX_LOC_BD_NAME_LEN; i++) {

    oob_data.device_name[i] = local_name[i];

system/main/shim/btm_api.h

+1 −1
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ tBTM_STATUS BTM_SetDeviceClass(DEV_CLASS dev_class); 
 *                              is returned and p_name is set to NULL

 *

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

tBTM_STATUS BTM_ReadLocalDeviceName(char** p_name);

tBTM_STATUS BTM_ReadLocalDeviceName(const char** p_name);



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

 *

system/stack/btm/btm_devctl.cc

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ tBTM_STATUS BTM_SetLocalDeviceName(const char* p_name) { 
 *                              is returned and p_name is set to NULL

 *

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

tBTM_STATUS BTM_ReadLocalDeviceName(char** p_name) {

tBTM_STATUS BTM_ReadLocalDeviceName(const char** p_name) {

  *p_name = btm_cb.cfg.bd_name;

  return (BTM_SUCCESS);

}

system/stack/gap/gap_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ tGATT_STATUS read_attr_value(uint16_t handle, tGATT_VALUE* p_value, 


      switch (db_attr.uuid) {

        case GATT_UUID_GAP_DEVICE_NAME:

          BTM_ReadLocalDeviceName((char**)&p_dev_name);

          BTM_ReadLocalDeviceName((const char**)&p_dev_name);

          if (strlen((char*)p_dev_name) > GATT_MAX_ATTR_LEN)

            p_value->len = GATT_MAX_ATTR_LEN;

          else