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

Commit ad84277d authored by William Escande's avatar William Escande Committed by Android (Google) Code Review
Browse files

Merge "SDP: Set address in tBTM_REMOTE_DEV_NAME" into tm-d1-dev

parents 755c3f98 f7c0a042

system/bta/dm/bta_dm_act.cc

+3 −1
Original line number Original line Diff line number Diff line
@@ -966,7 +966,7 @@ static bool bta_dm_read_remote_device_name(const RawAddress& bd_addr, 




    /* Remote name discovery is on going now so BTM cannot notify through

    /* Remote name discovery is on going now so BTM cannot notify through

     * "bta_dm_remname_cback" */

     * "bta_dm_remname_cback" */

    /* adding callback to get notified that current reading remore name done */

    /* adding callback to get notified that current reading remote name done */





    if (bluetooth::shim::is_gd_security_enabled()) {

    if (bluetooth::shim::is_gd_security_enabled()) {

      bluetooth::shim::BTM_SecAddRmtNameNotifyCallback(

      bluetooth::shim::BTM_SecAddRmtNameNotifyCallback(
@@ -1879,6 +1879,8 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 




  APPL_TRACE_DEBUG("%s name=<%s>", __func__, bd_name);

  APPL_TRACE_DEBUG("%s name=<%s>", __func__, bd_name);





  rem_name.bd_addr = bd_addr;



  /* if this is what we are looking for */

  /* if this is what we are looking for */

  if (bta_dm_search_cb.peer_bdaddr == bd_addr) {

  if (bta_dm_search_cb.peer_bdaddr == bd_addr) {

    rem_name.length = strlcpy((char*)rem_name.remote_bd_name, (char*)bd_name,

    rem_name.length = strlcpy((char*)rem_name.remote_bd_name, (char*)bd_name,

system/stack/btm/btm_inq.cc

+3 −0
Original line number Original line Diff line number Diff line
@@ -1443,7 +1443,10 @@ void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn, 
  uint16_t temp_evt_len;

  uint16_t temp_evt_len;





  if (bda) {

  if (bda) {

    rem_name.bd_addr = *bda;

    VLOG(2) << "BDA " << *bda;

    VLOG(2) << "BDA " << *bda;

  } else {

    rem_name.bd_addr = RawAddress::kEmpty;

  }

  }





  VLOG(2) << "Inquire BDA " << p_inq->remname_bda;

  VLOG(2) << "Inquire BDA " << p_inq->remname_bda;