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

Commit 0830163f authored by Ying Hsu's avatar Ying Hsu Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix empty peer name issue when RNR is skipped" am: 60704b82 

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



Change-Id: I5eac94da056276e8a4ac131ee0ac3f0a8c76e0dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f389bb9 60704b82

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ void bta_dm_search_cmpl() { 
  tBTA_DM_SEARCH result;

  result.disc_ble_res.services = &gatt_services;

  result.disc_ble_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

  strlcpy((char*)result.disc_ble_res.bd_name, (char*)bta_dm_search_cb.peer_name,

  strlcpy((char*)result.disc_ble_res.bd_name, bta_dm_get_remname(),

          BD_NAME_LEN + 1);



  LOG_INFO("GATT services discovered using LE Transport");
@@ -1854,7 +1854,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
  p_msg->disc_result.result.disc_res.services = bta_dm_search_cb.services_found;

  p_msg->disc_result.result.disc_res.bd_addr = bta_dm_search_cb.peer_bdaddr;

  strlcpy((char*)p_msg->disc_result.result.disc_res.bd_name,

          (char*)bta_dm_search_cb.peer_name, BD_NAME_LEN + 1);

          bta_dm_get_remname(), BD_NAME_LEN + 1);



  bta_sys_sendmsg(p_msg);

}