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

Commit db9fedb6 authored by Palash Ahuja's avatar Palash Ahuja Committed by Automerger Merge Worker
Browse files

[BluetoothMetrics] Remove the calling functions to am: b9b157e9 am: 0894b829 

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



Change-Id: Iba90aabca50a9b7a38932011a2d3931376d36114
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cda98e5c 0894b829

system/gd/hci/acl_manager/le_impl.h

+0 −37
Original line number Diff line number Diff line
@@ -355,16 +355,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    AddressWithType remote_address(address, peer_address_type);

    AddressWithType local_address = le_address_manager_->GetInitiatorAddress();

    const bool in_filter_accept_list = is_device_in_connect_list(remote_address);

    auto argument_list = std::vector<std::pair<bluetooth::os::ArgumentType, int>>();

    argument_list.push_back(

        std::make_pair(os::ArgumentType::ACL_STATUS_CODE, static_cast<int>(status)));



    bluetooth::os::LogMetricBluetoothLEConnectionMetricEvent(

        address,

        android::bluetooth::le::LeConnectionOriginType::ORIGIN_NATIVE,

        android::bluetooth::le::LeConnectionType::CONNECTION_TYPE_LE_ACL,

        android::bluetooth::le::LeConnectionState::STATE_LE_ACL_END,

        argument_list);



    if (role == hci::Role::CENTRAL) {

      connectability_state_ = ConnectabilityState::DISARMED;
@@ -501,16 +491,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    }

    AddressWithType remote_address(address, remote_address_type);

    const bool in_filter_accept_list = is_device_in_connect_list(remote_address);

    auto argument_list = std::vector<std::pair<bluetooth::os::ArgumentType, int>>();

    argument_list.push_back(

        std::make_pair(os::ArgumentType::ACL_STATUS_CODE, static_cast<int>(status)));



    bluetooth::os::LogMetricBluetoothLEConnectionMetricEvent(

        address,

        android::bluetooth::le::LeConnectionOriginType::ORIGIN_NATIVE,

        android::bluetooth::le::LeConnectionType::CONNECTION_TYPE_LE_ACL,

        android::bluetooth::le::LeConnectionState::STATE_LE_ACL_END,

        argument_list);



    if (role == hci::Role::CENTRAL) {

      connectability_state_ = ConnectabilityState::DISARMED;
@@ -1015,14 +996,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 


  void disarm_connectability() {



    auto argument_list = std::vector<std::pair<os::ArgumentType, int>>();

    bluetooth::os::LogMetricBluetoothLEConnectionMetricEvent(

        Address::kEmpty,

        os::LeConnectionOriginType::ORIGIN_UNSPECIFIED,

        os::LeConnectionType::CONNECTION_TYPE_LE_ACL,

        os::LeConnectionState::STATE_LE_ACL_CANCEL,

        argument_list);



    switch (connectability_state_) {

      case ConnectabilityState::ARMED:

        LOG_INFO("Disarming LE connection state machine with create connection cancel");
@@ -1119,16 +1092,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    if (create_connection_timeout_alarms_.find(address_with_type) != create_connection_timeout_alarms_.end()) {

      create_connection_timeout_alarms_.at(address_with_type).Cancel();

      create_connection_timeout_alarms_.erase(address_with_type);

      auto argument_list = std::vector<std::pair<os::ArgumentType, int>>();

      argument_list.push_back(std::make_pair(

          os::ArgumentType::ACL_STATUS_CODE,

          static_cast<int>(android::bluetooth::hci::StatusEnum::STATUS_CONNECTION_TOUT)));

      bluetooth::os::LogMetricBluetoothLEConnectionMetricEvent(

          address_with_type.GetAddress(),

          android::bluetooth::le::LeConnectionOriginType::ORIGIN_NATIVE,

          android::bluetooth::le::LeConnectionType::CONNECTION_TYPE_LE_ACL,

          android::bluetooth::le::LeConnectionState::STATE_LE_ACL_TIMEOUT,

          argument_list);



      if (background_connections_.find(address_with_type) != background_connections_.end()) {

        direct_connections_.erase(address_with_type);

system/stack/acl/btm_acl.cc

+0 −9
Original line number Diff line number Diff line
@@ -2828,15 +2828,6 @@ bool acl_create_le_connection_with_id(uint8_t id, const RawAddress& bd_addr, 
    return false;

  }



  // argument list

  auto argument_list = std::vector<std::pair<bluetooth::os::ArgumentType, int>>();



  bluetooth::shim::LogMetricBluetoothLEConnectionMetricEvent(

      bd_addr, android::bluetooth::le::LeConnectionOriginType::ORIGIN_NATIVE,

      android::bluetooth::le::LeConnectionType::CONNECTION_TYPE_LE_ACL,

      android::bluetooth::le::LeConnectionState::STATE_LE_ACL_START,

      argument_list);



  if (bluetooth::common::init_flags::

          use_unified_connection_manager_is_enabled()) {

    bluetooth::connection::GetConnectionManager().start_direct_connection(

system/stack/l2cap/l2c_api.cc

+0 −10
Original line number Diff line number Diff line
@@ -1357,16 +1357,6 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda) { 
  }



  if (transport == BT_TRANSPORT_LE) {

    auto argument_list = std::vector<std::pair<bluetooth::os::ArgumentType, int>>();

    argument_list.push_back(std::make_pair(bluetooth::os::ArgumentType::L2CAP_CID, fixed_cid));



    bluetooth::shim::LogMetricBluetoothLEConnectionMetricEvent(

        rem_bda,

        android::bluetooth::le::LeConnectionOriginType::ORIGIN_NATIVE,

        android::bluetooth::le::LeConnectionType::CONNECTION_TYPE_LE_ACL,

        android::bluetooth::le::LeConnectionState::STATE_LE_ACL_START,

        argument_list);



    bool ret = l2cu_create_conn_le(p_lcb);

    if (!ret) {

      LOG_WARN("Unable to create fixed channel le connection fixed_cid:0x%04x",