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

Commit d6309c7c authored by Chris Manton's avatar Chris Manton
Browse files

Properly retrieve acl_conn stack/acl/btm_acl::btm_read_failed_contact_counter_complete 

Towards encapsulation

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: I8391353a58a57c0f5d57e80e14ca0c122f30a1dc
parent 7caafe34

system/stack/acl/btm_acl.cc

+3 −7
Original line number Diff line number Diff line
@@ -1948,7 +1948,6 @@ void btm_read_failed_contact_counter_timeout(UNUSED_ATTR void* data) { 
void btm_read_failed_contact_counter_complete(uint8_t* p) {

  tBTM_CMPL_CB* p_cb = btm_cb.devcb.p_failed_contact_counter_cmpl_cb;

  tBTM_FAILED_CONTACT_COUNTER_RESULT result;

  tACL_CONN* p_acl_cb = &btm_cb.acl_cb_.acl_db[0];



  alarm_cancel(btm_cb.devcb.read_failed_contact_counter_timer);

  btm_cb.devcb.p_failed_contact_counter_cmpl_cb = NULL;
@@ -1968,12 +1967,9 @@ void btm_read_failed_contact_counter_complete(uint8_t* p) { 
                result.failed_contact_counter,

                RoleText(result.hci_status).c_str());



      /* Search through the list of active channels for the correct BD Addr */

      for (uint16_t index = 0; index < MAX_L2CAP_LINKS; index++, p_acl_cb++) {

        if ((p_acl_cb->in_use) && (handle == p_acl_cb->hci_handle)) {

      tACL_CONN* p_acl_cb = internal_.acl_get_connection_from_handle(handle);

      if (p_acl_cb != nullptr) {

        result.rem_bda = p_acl_cb->remote_addr;

          break;

        }

      }

    } else {

      result.status = BTM_ERR_PROCESSING;