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

Commit fed53459 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check remote address before trigger name callback" am: bff45ba1 

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

Change-Id: I76fda2319330fab1e76fb6ec5c2c0a64954f8312
parents 1a1e0688 bff45ba1

system/bta/dm/bta_dm_act.cc

+7 −5
Original line number Diff line number Diff line
@@ -1933,12 +1933,14 @@ static void bta_dm_remname_cback(void* p) { 
  strlcpy((char*)bta_dm_search_cb.peer_name,

          (char*)p_remote_name->remote_bd_name, BD_NAME_LEN + 1);



  if (bta_dm_search_cb.peer_bdaddr == p_remote_name->bd_addr) {

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

      bluetooth::shim::BTM_SecDeleteRmtNameNotifyCallback(

          &bta_dm_service_search_remname_cback);

    } else {

      BTM_SecDeleteRmtNameNotifyCallback(&bta_dm_service_search_remname_cback);

    }

  }



  if (bta_dm_search_cb.transport == BT_TRANSPORT_LE) {

    GAP_BleReadPeerPrefConnParams(bta_dm_search_cb.peer_bdaddr);