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

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

Straighten out stack/acl/btm_acl::acl_address_from_handle am: 0f543a6c am:... 

Straighten out stack/acl/btm_acl::acl_address_from_handle am: 0f543a6c am: e55efffe am: 1dbd650b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a1a0bf3de1b069a0910a96f3aed8114e6b6ad99
parents c93c5ff9 1dbd650b

system/stack/acl/acl.h

+0 −1
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ typedef struct { 
                                tBTM_PM_MODE* p_mode);

  friend bool acl_is_role_switch_allowed();

  friend bool btm_pm_is_le_link(const RawAddress& remote_bda);

  friend const RawAddress acl_address_from_handle(uint16_t hci_handle);

  friend int btm_pm_find_acl_ind(const RawAddress& remote_bda);

  friend tACL_CONN* btm_bda_to_acl(const RawAddress& bda,

                                   tBT_TRANSPORT transport);

system/stack/acl/btm_acl.cc

+4 −4
Original line number Diff line number Diff line
@@ -2452,12 +2452,12 @@ bool BTM_IsBleConnection(uint16_t hci_handle) { 
  return p_acl->is_transport_ble();

}



const RawAddress acl_address_from_handle(uint16_t hci_handle) {

  uint8_t index = btm_handle_to_acl_index(hci_handle);

  if (index >= MAX_L2CAP_LINKS) {

const RawAddress acl_address_from_handle(uint16_t handle) {

  tACL_CONN* p_acl = acl_get_connection_from_handle(handle);

  if (p_acl == nullptr) {

    return RawAddress::kEmpty;

  }

  return btm_cb.acl_cb_.acl_db[index].remote_addr;

  return p_acl->remote_addr;

}



tBTM_PM_MCB* acl_power_mode_from_handle(uint16_t hci_handle) {