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

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

Merge "Ignore empty pseudo address" into main am: cad799bd 

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



Change-Id: Iaee47e33e18f77c962706bd7183f3690564f7cb2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8df06037 cad799bd

system/bta/dm/bta_dm_act.cc

+4 −3
Original line number Diff line number Diff line
@@ -571,6 +571,10 @@ void bta_dm_remove_device(const RawAddress& target) { 
  RawAddress identity_addr = target;

  bool le_connected = get_btm_client_interface().peer.BTM_ReadConnectedTransportAddress(

          &pseudo_addr, BT_TRANSPORT_LE);

  if (pseudo_addr.IsEmpty()) {

    pseudo_addr = target;

  }



  bool bredr_connected = get_btm_client_interface().peer.BTM_ReadConnectedTransportAddress(

          &identity_addr, BT_TRANSPORT_BR_EDR);

  /* If connection not found with identity address, check with pseudo address if different */
@@ -579,9 +583,6 @@ void bta_dm_remove_device(const RawAddress& target) { 
    bredr_connected = get_btm_client_interface().peer.BTM_ReadConnectedTransportAddress(

            &identity_addr, BT_TRANSPORT_BR_EDR);

  }

  if (pseudo_addr.IsEmpty()) {

    pseudo_addr = target;

  }

  if (identity_addr.IsEmpty()) {

    identity_addr = target;

  }