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

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

btif::{bqr, iot} Use proper return code BTM_ReadRemoteVersion 

Bug: 350988287
Test: m .
Flag: EXEMPT, Proper data typing
Change-Id: I115d91dc379fb71f7620cc3125ac853b6feac3ff
parent cd70bb74

system/btif/src/btif_bqr.cc

+2 −3
Original line number Diff line number Diff line
@@ -786,11 +786,10 @@ static void btif_get_remote_version(const RawAddress& bd_addr, uint8_t& lmp_vers 
  uint8_t tmp_lmp_ver = 0;

  uint16_t tmp_manufacturer = 0;

  uint16_t tmp_lmp_subver = 0;

  tBTM_STATUS status;



  status = get_btm_client_interface().peer.BTM_ReadRemoteVersion(

  const bool status = get_btm_client_interface().peer.BTM_ReadRemoteVersion(

          bd_addr, &tmp_lmp_ver, &tmp_manufacturer, &tmp_lmp_subver);

  if (status == BTM_SUCCESS && (tmp_lmp_ver || tmp_manufacturer || tmp_lmp_subver)) {

  if (status && (tmp_lmp_ver || tmp_manufacturer || tmp_lmp_subver)) {

    lmp_version = tmp_lmp_ver;

    manufacturer = tmp_manufacturer;

    lmp_sub_version = tmp_lmp_subver;

system/btif/src/btif_iot_config.cc

+3 −5
Original line number Diff line number Diff line
@@ -77,8 +77,6 @@ void btif_iot_update_remote_info(tBTA_DM_AUTH_CMPL* p_auth_cmpl, bool is_ble, bo 
  uint8_t lmp_ver = 0;

  uint16_t lmp_subver = 0;

  uint16_t mfct_set = 0;

  tBTM_STATUS btm_status;



  // save remote name to iot conf file

  if (strlen((const char*)p_auth_cmpl->bd_name)) {

    name_length = strlen((char*)p_auth_cmpl->bd_name) > BD_NAME_LEN
@@ -127,10 +125,10 @@ void btif_iot_update_remote_info(tBTA_DM_AUTH_CMPL* p_auth_cmpl, bool is_ble, bo 
                                 (int)p_auth_cmpl->addr_type);



  // save remote versions to iot conf file

  btm_status = get_btm_client_interface().peer.BTM_ReadRemoteVersion(p_auth_cmpl->bd_addr, &lmp_ver,

                                                                     &mfct_set, &lmp_subver);

  const bool status = get_btm_client_interface().peer.BTM_ReadRemoteVersion(

          p_auth_cmpl->bd_addr, &lmp_ver, &mfct_set, &lmp_subver);



  if (btm_status == BTM_SUCCESS) {

  if (status) {

    DEVICE_IOT_CONFIG_ADDR_SET_INT(p_auth_cmpl->bd_addr, IOT_CONF_KEY_MANUFACTURER, mfct_set);

    DEVICE_IOT_CONFIG_ADDR_SET_INT(p_auth_cmpl->bd_addr, IOT_CONF_KEY_LMPVER, lmp_ver);

    DEVICE_IOT_CONFIG_ADDR_SET_INT(p_auth_cmpl->bd_addr, IOT_CONF_KEY_LMPSUBVER, lmp_subver);