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

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

Remove tBT_TRANSPORT from acl_refresh_remote_address am: ace4ed22 

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

Change-Id: I10f1f39bfd8f9747817d0f7487554fe2c3f079ff
parents 3e1f2d5e ace4ed22

system/stack/acl/btm_acl.cc

+4 −3
Original line number Diff line number Diff line
@@ -2424,10 +2424,11 @@ bool BTM_BLE_IS_RESOLVE_BDA(const RawAddress& x) { 
}



bool acl_refresh_remote_address(const tBTM_SEC_DEV_REC* p_sec_rec,

                                const RawAddress& bda, tBT_TRANSPORT transport,

                                uint8_t rra_type, const RawAddress& rpa) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(bda, transport);

                                const RawAddress& bda, uint8_t rra_type,

                                const RawAddress& rpa) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(bda, BT_TRANSPORT_LE);

  if (p_acl == nullptr) {

    LOG_WARN("%s Unable to refresh remote address", __func__);

    return false;

  }

system/stack/btm/btm_ble_addr.cc

+4 −5
Original line number Diff line number Diff line
@@ -309,7 +309,6 @@ bool btm_random_pseudo_to_identity_addr(RawAddress* random_pseudo, 
void btm_ble_refresh_peer_resolvable_private_addr(const RawAddress& pseudo_bda,

                                                  const RawAddress& rpa,

                                                  uint8_t rra_type) {

  /* update security record here, in adv event or connection complete process */

  tBTM_SEC_DEV_REC* p_sec_rec = btm_find_dev(pseudo_bda);

  if (p_sec_rec != NULL) {

    p_sec_rec->ble.cur_rand_addr = rpa;
@@ -329,12 +328,12 @@ void btm_ble_refresh_peer_resolvable_private_addr(const RawAddress& pseudo_bda, 
                  p_sec_rec->ble.active_addr_type);



  /* connection refresh remote address */

  if (!acl_refresh_remote_address(p_sec_rec, p_sec_rec->bd_addr,

                                  BT_TRANSPORT_LE, rra_type, rpa)) {

  if (!acl_refresh_remote_address(p_sec_rec, p_sec_rec->bd_addr, rra_type,

                                  rpa)) {

    // Try looking up the pseudo random address

    if (!acl_refresh_remote_address(p_sec_rec, p_sec_rec->ble.pseudo_addr,

                                    BT_TRANSPORT_LE, rra_type, rpa)) {

      BTM_TRACE_ERROR("%s Unknown device to refresh remote device", __func__);

                                    rra_type, rpa)) {

      LOG_ERROR("%s Unknown device to refresh remote device", __func__);

    }

  }

}

system/stack/include/acl_api.h

+1 −2
Original line number Diff line number Diff line
@@ -224,8 +224,7 @@ bool acl_ble_is_role_master(const RawAddress& bda); 
bool BTM_BLE_IS_RESOLVE_BDA(const RawAddress& x);



bool acl_refresh_remote_address(const tBTM_SEC_DEV_REC* p_dev_rec,

                                const RawAddress& remote_bda,

                                tBT_TRANSPORT transport, uint8_t rra_type,

                                const RawAddress& remote_bda, uint8_t rra_type,

                                const RawAddress& rpa);



void btm_establish_continue_from_address(const RawAddress& remote_bda,