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

Commit 49360fe8 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Use controller for WriteLocalName" into main am: bd632d9b am: f8a6b85a 

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



Change-Id: If7cfdfe5d95ec449bc803db820c4bcfad4f5d8f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef6b1010 f8a6b85a

system/stack/btm/btm_devctl.cc

+13 −11
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ void BTM_db_reset(void) { 
    p_cb = btm_cb.devcb.p_rln_cmpl_cb;

    btm_cb.devcb.p_rln_cmpl_cb = NULL;



    if (p_cb) (*p_cb)((void*)NULL);

    if (p_cb) {

      (*p_cb)(nullptr);

    }

  }



  if (btm_cb.devcb.p_rssi_cmpl_cb) {
@@ -324,19 +326,19 @@ static void decode_controller_support() { 
 *

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

tBTM_STATUS BTM_SetLocalDeviceName(const char* p_name) {

  uint8_t* p;



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

    return (BTM_ILLEGAL_VALUE);

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

    return BTM_ILLEGAL_VALUE;

  }



  if (bluetooth::shim::GetController() == nullptr) return (BTM_DEV_RESET);

  if (bluetooth::shim::GetController() == nullptr) {

    return BTM_DEV_RESET;

  }

  /* Save the device name if local storage is enabled */

  p = (uint8_t*)btm_sec_cb.cfg.bd_name;

  if (p != (uint8_t*)p_name)



  bd_name_from_char_pointer(btm_sec_cb.cfg.bd_name, p_name);



  btsnd_hcic_change_name(p);

  return (BTM_CMD_STARTED);

  bluetooth::shim::GetController()->WriteLocalName(p_name);

  return BTM_CMD_STARTED;

}



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

system/stack/btu/btu_hcif.cc

+0 −1
Original line number Diff line number Diff line
@@ -994,7 +994,6 @@ static void btu_hcif_hdl_command_complete(uint16_t opcode, uint8_t* p, 
    case HCI_BLE_READ_RESOLVABLE_ADDR_LOCAL:

    case HCI_BLE_SET_ADDR_RESOLUTION_ENABLE:

    case HCI_BLE_SET_RAND_PRIV_ADDR_TIMOUT:

    case HCI_CHANGE_LOCAL_NAME:

    case HCI_WRITE_CLASS_OF_DEVICE:

    case HCI_WRITE_DEF_POLICY_SETTINGS:

    case HCI_WRITE_EXT_INQ_RESPONSE:

system/stack/hcic/hcicmds.cc

+0 −26
Original line number Diff line number Diff line
@@ -341,12 +341,6 @@ 
#define HCI_DELETE_KEY_ALL_FLAG_OFF 6

/* Delete Stored Key */



/* Change Local Name */

#define HCIC_PARAM_SIZE_CHANGE_NAME BD_NAME_LEN



#define HCI_CHANGE_NAME_NAME_OFF 0

/* Change Local Name */



#define HCIC_PARAM_SIZE_READ_CMD 0



#define HCIC_PARAM_SIZE_WRITE_PARAM1 1
@@ -974,26 +968,6 @@ void btsnd_hcic_delete_stored_key(const RawAddress& bd_addr, 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_change_name(BD_NAME name) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);

  uint16_t len = strlen((char*)name) + 1;



  memset(pp, 0, HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_CHANGE_NAME);



  p->len = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_CHANGE_NAME;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_CHANGE_LOCAL_NAME);

  UINT8_TO_STREAM(pp, HCIC_PARAM_SIZE_CHANGE_NAME);



  if (len > HCIC_PARAM_SIZE_CHANGE_NAME) len = HCIC_PARAM_SIZE_CHANGE_NAME;



  ARRAY_TO_STREAM(pp, name, len);



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_read_name(void) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);

system/stack/include/hcidefs.h

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ 
#define HCI_READ_STORED_LINK_KEY (0x000D | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

#define HCI_WRITE_STORED_LINK_KEY (0x0011 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

#define HCI_DELETE_STORED_LINK_KEY (0x0012 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

#define HCI_CHANGE_LOCAL_NAME (0x0013 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

#define HCI_READ_LOCAL_NAME (0x0014 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

#define HCI_READ_CONN_ACCEPT_TOUT (0x0015 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

#define HCI_WRITE_CONN_ACCEPT_TOUT (0x0016 | HCI_GRP_HOST_CONT_BASEBAND_CMDS)

system/stack/include/hcimsgs.h

+0 −3
Original line number Diff line number Diff line
@@ -183,9 +183,6 @@ void btsnd_hcic_delete_stored_key(const RawAddress& bd_addr, 
                                  bool delete_all_flag);

/* Delete Stored Key */



/* Change Local Name */

void btsnd_hcic_change_name(BD_NAME name);



#define HCIC_PARAM_SIZE_READ_CMD 0



#define HCIC_PARAM_SIZE_WRITE_PARAM1 1