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

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

Clean up btm_acl_update_conn_addr am: 7fc1de04 am: a587b54f am: bf1c74e8 

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

Change-Id: Id53366b8405731ddbf56a854bba26279e9492199
parents e1ff204a bf1c74e8

system/stack/acl/acl.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -212,8 +212,6 @@ typedef struct { 
  friend void btm_acl_process_sca_cmpl_pkt(uint8_t evt_len, uint8_t* p);

  friend void btm_acl_process_sca_cmpl_pkt(uint8_t evt_len, uint8_t* p);

  friend void btm_acl_role_changed(tHCI_STATUS hci_status,

  friend void btm_acl_role_changed(tHCI_STATUS hci_status,

                                   const RawAddress& bd_addr, uint8_t new_role);

                                   const RawAddress& bd_addr, uint8_t new_role);

  friend void btm_acl_update_conn_addr(uint16_t conn_handle,

                                       const RawAddress& address);

  friend void btm_pm_proc_cmd_status(uint8_t status);

  friend void btm_pm_proc_cmd_status(uint8_t status);

  friend void btm_pm_proc_mode_change(uint8_t hci_status, uint16_t hci_handle,

  friend void btm_pm_proc_mode_change(uint8_t hci_status, uint16_t hci_handle,

                                      uint8_t mode, uint16_t interval);

                                      uint8_t mode, uint16_t interval);

system/stack/acl/btm_acl.cc

+6 −4
Original line number Original line Diff line number Diff line
@@ -370,11 +370,13 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
  }

  }

}

}





void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address) {

void btm_acl_update_conn_addr(uint16_t handle, const RawAddress& address) {

  uint8_t idx = btm_handle_to_acl_index(conn_handle);

  tACL_CONN* p_acl = internal_.acl_get_connection_from_handle(handle);

  if (idx != MAX_L2CAP_LINKS) {

  if (p_acl == nullptr) {

    btm_cb.acl_cb_.acl_db[idx].conn_addr = address;

    LOG_WARN("Unable to find active acl");

    return;

  }

  }

  p_acl->conn_addr = address;

}

}





/*******************************************************************************

/*******************************************************************************