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

Commit 913c1b69 authored by Chris Manton's avatar Chris Manton
Browse files

Use proper API BTM_IsAclConnectionUp 

Working towards encapsulation of tACL_CONN

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I60afb35f2aab772415d757ceeebf95f874f7a376
parent ff8c3afd

system/stack/btm/btm_ble.cc

+2 −2
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ bool BTM_ReadConnectedTransportAddress(RawAddress* remote_bda, 
  if (p_dev_rec == NULL) return false;



  if (transport == BT_TRANSPORT_BR_EDR) {

    if (btm_bda_to_acl(p_dev_rec->bd_addr, transport) != NULL) {

    if (BTM_IsAclConnectionUp(p_dev_rec->bd_addr, transport)) {

      *remote_bda = p_dev_rec->bd_addr;

      return true;

    } else if (p_dev_rec->device_type & BT_DEVICE_TYPE_BREDR) {
@@ -561,7 +561,7 @@ bool BTM_ReadConnectedTransportAddress(RawAddress* remote_bda, 


  if (transport == BT_TRANSPORT_LE) {

    *remote_bda = p_dev_rec->ble.pseudo_addr;

    if (btm_bda_to_acl(p_dev_rec->ble.pseudo_addr, transport) != NULL)

    if (BTM_IsAclConnectionUp(p_dev_rec->ble.pseudo_addr, transport))

      return true;

    else

      return false;

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -2356,7 +2356,7 @@ void btm_sec_check_pending_reqs(void) { 
    tBTM_SEC_QUEUE_ENTRY* p_e;

    while ((p_e = (tBTM_SEC_QUEUE_ENTRY*)fixed_queue_try_dequeue(bq)) != NULL) {

      /* Check that the ACL is still up before starting security procedures */

      if (btm_bda_to_acl(p_e->bd_addr, p_e->transport) != NULL) {

      if (BTM_IsAclConnectionUp(p_e->bd_addr, p_e->transport)) {

        if (p_e->psm != 0) {

          BTM_TRACE_EVENT(

              "%s PSM:0x%04x Is_Orig:%u mx_proto_id:%u mx_chan_id:%u", __func__,
@@ -5251,7 +5251,7 @@ static bool btm_sec_check_prefetch_pin(tBTM_SEC_DEV_REC* p_dev_rec) { 
      if (btm_cb.api.p_pin_callback &&

          ((btm_cb.pairing_flags & BTM_PAIR_FLAGS_PIN_REQD) == 0)) {

        BTM_TRACE_DEBUG("%s() PIN code callback called", __func__);

        if (btm_bda_to_acl(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR) == NULL)

        if (BTM_IsAclConnectionUp(p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR))

          btm_cb.pairing_flags |= BTM_PAIR_FLAGS_PIN_REQD;

        (btm_cb.api.p_pin_callback)(

            p_dev_rec->bd_addr, p_dev_rec->dev_class, p_dev_rec->sec_bd_name,