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

Commit 25cf9612 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix empty peer name issue when RNR is skipped" into tm-qpr-dev am: db983322 

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



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

system/bta/dm/bta_dm_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -1312,7 +1312,7 @@ void bta_dm_search_cmpl() { 
  std::vector<Uuid> gatt_services;

  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);



  bool send_gatt_results =
@@ -1820,7 +1820,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);

}