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

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

Replace return tBTM_STATUS=>bool BTM_ReadRemoteVersion am: be1ea212 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1491240

Change-Id: I55bf0319286b4b87257e4f54eaf9a4ba5d28b569
parents 246a2aea be1ea212

system/btif/src/btif_dm.cc

+4 −3
Original line number Diff line number Diff line
@@ -478,16 +478,17 @@ static void btif_update_remote_version_property(RawAddress* p_bd) { 
  uint8_t lmp_ver = 0;

  uint16_t lmp_subver = 0;

  uint16_t mfct_set = 0;

  tBTM_STATUS btm_status;

  bool version_info_valid = false;

  bt_remote_version_t info;

  bt_status_t status;



  btm_status = BTM_ReadRemoteVersion(*p_bd, &lmp_ver, &mfct_set, &lmp_subver);

  version_info_valid =

      BTM_ReadRemoteVersion(*p_bd, &lmp_ver, &mfct_set, &lmp_subver);



  LOG_INFO("remote version info [%s]: %x, %x, %x", p_bd->ToString().c_str(),

           lmp_ver, mfct_set, lmp_subver);



  if (btm_status == BTM_SUCCESS) {

  if (version_info_valid) {

    // Always update cache to ensure we have availability whenever BTM API is

    // not populated

    info.manufacturer = mfct_set;

system/main/shim/btm_api.h

+3 −4
Original line number Diff line number Diff line
@@ -1031,12 +1031,11 @@ tBTM_STATUS BTM_EnableTestMode(void); 
 *

 * Description      This function is called to read a remote device's version

 *

 * Returns          BTM_SUCCESS if successful, otherwise an error

 * Returns          true if valid, false otherwise

 *

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

tBTM_STATUS BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                                  uint16_t* manufacturer,

                                  uint16_t* lmp_sub_version);

bool BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                           uint16_t* manufacturer, uint16_t* lmp_sub_version);



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

 *

system/stack/acl/btm_acl.cc

+4 −12
Original line number Diff line number Diff line
@@ -1494,20 +1494,12 @@ uint16_t BTM_GetMaxPacketSize(const RawAddress& addr) { 
  return (pkt_size);

}



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

 *

 * Function         BTM_ReadRemoteVersion

 *

 * Returns          If connected report peer device info

 *

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

tBTM_STATUS BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                                  uint16_t* manufacturer,

                                  uint16_t* lmp_sub_version) {

bool BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                           uint16_t* manufacturer, uint16_t* lmp_sub_version) {

  tACL_CONN* p = internal_.btm_bda_to_acl(addr, BT_TRANSPORT_BR_EDR);

  if (p == NULL) {

    LOG_WARN("Unable to find active acl");

    return (BTM_UNKNOWN_ADDR);

    return false;

  }



  if (lmp_version) *lmp_version = p->lmp_version;
@@ -1516,7 +1508,7 @@ tBTM_STATUS BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version, 


  if (lmp_sub_version) *lmp_sub_version = p->lmp_subversion;



  return (BTM_SUCCESS);

  return true;

}



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

system/stack/include/btm_api.h

+3 −4
Original line number Diff line number Diff line
@@ -401,12 +401,11 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void); 
 *

 * Description      This function is called to read a remote device's version

 *

 * Returns          BTM_SUCCESS if successful, otherwise an error

 * Returns          true if data valid, false otherwise

 *

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

tBTM_STATUS BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                                  uint16_t* manufacturer,

                                  uint16_t* lmp_sub_version);

bool BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version,

                           uint16_t* manufacturer, uint16_t* lmp_sub_version);



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

 *