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

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

Merge "Use p_acl->remote_addr to do BTA_dm_acl_down" am: f0156dc5 am: 1619004b 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1492959

Change-Id: I2ac75aefb77a308a130cba9f827f4df92eb44840
parents 91bda67c 1619004b

system/stack/acl/btm_acl.cc

+1 −6
Original line number Diff line number Diff line
@@ -396,17 +396,12 @@ void btm_acl_removed(uint16_t handle) { 
    LOG_WARN("Unable to find active acl");

    return;

  }

  RawAddress bda = p_acl->remote_addr;

  tBT_TRANSPORT transport = p_acl->transport;

  if (transport == BT_TRANSPORT_LE) {

    bda = p_acl->conn_addr;

  }

  p_acl->in_use = false;



  /* Only notify if link up has had a chance to be issued */

  if (p_acl->link_up_issued) {

    p_acl->link_up_issued = false;

    BTA_dm_acl_down(bda, transport);

    BTA_dm_acl_down(p_acl->remote_addr, p_acl->transport);

  }



  memset(p_acl, 0, sizeof(tACL_CONN));