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

Commit a0b6f9be authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "[Connection Manager] Remove unused fields in acl connection" am: efbdcf5c 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2515396



Change-Id: Ia2206ac98d052eb3b46080072b50b2c5a1cd573d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d1590de efbdcf5c

system/main/shim/acl.cc

+0 −3
Original line number Diff line number Diff line
@@ -1267,9 +1267,6 @@ void DumpsysAcl(int fd) { 
      LOG_DUMPSYS(fd, "    [le] active_remote_addr:%s[%s]",

                  ADDRESS_TO_LOGGABLE_CSTR(link.active_remote_addr),

                  AddressTypeText(link.active_remote_addr_type).c_str());

      LOG_DUMPSYS(fd, "    [le] conn_addr:%s[%s]",

                  ADDRESS_TO_LOGGABLE_CSTR(link.conn_addr),

                  AddressTypeText(link.conn_addr_type).c_str());

    }

  }

}

system/stack/acl/acl.cc

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ void tACL_CONN::Reset() { 
  memset(peer_lmp_feature_pages, 0, sizeof(peer_lmp_feature_pages));

  memset(peer_lmp_feature_valid, 0, sizeof(peer_lmp_feature_valid));

  active_remote_addr = RawAddress::kEmpty;

  conn_addr = RawAddress::kEmpty;

  remote_addr = RawAddress::kEmpty;

  link_up_issued = false;

  transport = BT_TRANSPORT_AUTO;
@@ -36,7 +35,6 @@ void tACL_CONN::Reset() { 
  link_super_tout = 0;

  pkt_types_mask = 0;

  active_remote_addr_type = BLE_ADDR_PUBLIC;

  conn_addr_type = BLE_ADDR_PUBLIC;

  disconnect_reason = 0;

  encrypt_state_ = BTM_ACL_ENCRYPT_STATE_IDLE;

  is_encrypted = false;

system/stack/acl/acl.h

+0 −2
Original line number Diff line number Diff line
@@ -182,8 +182,6 @@ struct tACL_CONN { 


  RawAddress active_remote_addr;

  tBLE_ADDR_TYPE active_remote_addr_type;

  RawAddress conn_addr;

  tBLE_ADDR_TYPE conn_addr_type;



  RawAddress remote_addr;

  bool in_use{false};

system/stack/acl/ble_acl.cc

+0 −3
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ void acl_ble_enhanced_connection_complete( 
    return;

  }



  btm_ble_refresh_local_resolvable_private_addr(address_with_type.bda,

                                                local_rpa);



  if (peer_addr_type & BLE_ADDR_TYPE_ID_BIT)

    btm_ble_refresh_peer_resolvable_private_addr(

        address_with_type.bda, peer_rpa, tBTM_SEC_BLE::BTM_BLE_ADDR_RRA);

system/stack/acl/btm_acl.cc

+0 −43
Original line number Diff line number Diff line
@@ -446,11 +446,6 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
    btm_set_link_policy(p_acl, btm_cb.acl_cb_.DefaultLinkPolicy());

  }



  if (transport == BT_TRANSPORT_LE) {

    btm_ble_refresh_local_resolvable_private_addr(

        bda, btm_cb.ble_ctr_cb.addr_mgnt_cb.private_addr);

  }



  // save remote properties to iot conf file

  btm_iot_save_remote_properties(p_acl);
@@ -478,15 +473,6 @@ void btm_acl_create_failed(const RawAddress& bda, tBT_TRANSPORT transport, 
  BTA_dm_acl_up_failed(bda, transport, hci_status);

}



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

  tACL_CONN* p_acl = internal_.acl_get_connection_from_handle(handle);

  if (p_acl == nullptr) {

    LOG_WARN("Unable to find active acl");

    return;

  }

  p_acl->conn_addr = address;

}



void btm_configure_data_path(uint8_t direction, uint8_t path_id,

                             std::vector<uint8_t> vendor_config) {

  if (direction != btm_data_direction::CONTROLLER_TO_HOST &&
@@ -2440,35 +2426,6 @@ const RawAddress acl_address_from_handle(uint16_t handle) { 
  return p_acl->remote_addr;

}



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

 *

 * Function         btm_ble_refresh_local_resolvable_private_addr

 *

 * Description      This function refresh the currently used resolvable private

 *                  address for the active link to the remote device

 *

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

void btm_ble_refresh_local_resolvable_private_addr(

    const RawAddress& pseudo_addr, const RawAddress& local_rpa) {

  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 (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_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 {

      p_acl->conn_addr = local_rpa;

    }

  }

}



bool sco_peer_supports_esco_2m_phy(const RawAddress& remote_bda) {

  uint8_t* features = BTM_ReadRemoteFeatures(remote_bda);

  if (features == nullptr) {