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

Commit b3e0af71 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Ignore empty pseudo and identity address" into main

parents 9f28f88d d0467d12

system/bta/dm/bta_dm_act.cc

+7 −1
Original line number Diff line number Diff line
@@ -592,6 +592,12 @@ 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;

  }



  // Remove from LE allowlist

  if (!GATT_CancelConnect(0, pseudo_addr, false)) {
@@ -628,7 +634,7 @@ void bta_dm_remove_device(const RawAddress& target) { 


  if (le_connected || bredr_connected) {

    // Wait for all transports to be disconnected

    tBTA_DM_REMOVE_PENDNIG node = {pseudo_addr, target, le_connected, bredr_connected};

    tBTA_DM_REMOVE_PENDNIG node = {pseudo_addr, identity_addr, le_connected, bredr_connected};

    bta_dm_cb.pending_removals.push_back(node);

    log::info(

            "Waiting for disconnection over LE:{}, BR/EDR:{} for pseudo address: {}, identity "