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

Commit dab9bfe2 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use tACL_CONN::is_transport_ am: 5b000a42 am: 3a4a28f8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie5e105ba890d09ad081ce4153a132a61353c6485
parents 58249f60 3a4a28f8

system/stack/acl/btm_acl.cc

+2 −5
Original line number Diff line number Diff line
@@ -2476,12 +2476,9 @@ int btm_pm_find_acl_ind(const RawAddress& remote_bda) { 
  uint8_t xx;



  for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p++) {

    if (p->in_use && p->remote_addr == remote_bda &&

        p->transport == BT_TRANSPORT_BR_EDR) {

      LOG_VERBOSE("btm_pm_find_acl_ind ind:%d", xx);

    if (p->in_use && p->remote_addr == remote_bda && p->is_transport_br_edr())

      break;

  }

  }

  return xx;

}
@@ -2489,7 +2486,7 @@ bool btm_pm_is_le_link(const RawAddress& remote_bda) { 
  const tACL_CONN* p_acl = &btm_cb.acl_cb_.acl_db[0];

  for (uint8_t xx = 0; xx < MAX_L2CAP_LINKS; xx++, p_acl++) {

    if (p_acl->in_use && p_acl->remote_addr == remote_bda &&

        p_acl->transport == BT_TRANSPORT_LE) {

        p_acl->is_transport_ble()) {

      return true;

    }

  }