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

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

Streamline stack/acl/btm_acl::btm_ble_refresh_local_resolvable_private_addr... 

Streamline stack/acl/btm_acl::btm_ble_refresh_local_resolvable_private_addr am: 7a4ddac5 am: 9585b1e6

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

Change-Id: I71bc76eacf358b2ee8d3fc32730e796370456ae9
parents 4ed584c1 9585b1e6

system/stack/acl/btm_acl.cc

+13 −12
Original line number Diff line number Diff line
@@ -2557,21 +2557,22 @@ bool btm_pm_is_le_link(const RawAddress& remote_bda) { 
 ******************************************************************************/

void btm_ble_refresh_local_resolvable_private_addr(

    const RawAddress& pseudo_addr, const RawAddress& local_rpa) {

  tACL_CONN* p = internal_.btm_bda_to_acl(pseudo_addr, BT_TRANSPORT_LE);

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

  if (p_acl == nullptr) {

    LOG_WARN("Unable to find active acl");

    return;

  }



  if (p != NULL) {

    if (btm_cb.ble_ctr_cb.privacy_mode != BTM_PRIVACY_NONE) {

      p->conn_addr_type = BLE_ADDR_RANDOM;

      if (!local_rpa.IsEmpty())

        p->conn_addr = local_rpa;

      else

        p->conn_addr = btm_cb.ble_ctr_cb.addr_mgnt_cb.private_addr;

  if (btm_cb.ble_ctr_cb.privacy_mode == BTM_PRIVACY_NONE) {

    p_acl->conn_addr_type = BLE_ADDR_PUBLIC;

    p_acl->conn_addr = *controller_get_interface()->get_address();

  } else {

      p->conn_addr_type = BLE_ADDR_PUBLIC;

      p->conn_addr = *controller_get_interface()->get_address();

    }

    p_acl->conn_addr_type = BLE_ADDR_RANDOM;

    if (local_rpa.IsEmpty()) {

      p_acl->conn_addr = btm_cb.ble_ctr_cb.addr_mgnt_cb.private_addr;

    } else {

    LOG_WARN("Unable to find active acl");

      p_acl->conn_addr = local_rpa;

    }

  }

}