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

Commit 11799a4b authored by Chen Chen's avatar Chen Chen Committed by Automerger Merge Worker
Browse files

Merge "BluetoothMetrics: Upload remote device supported features" am:... 

Merge "BluetoothMetrics: Upload remote device supported features" am: e7dc582a am: 9e993893 am: d832de63

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



Change-Id: Id9d74307ca1f92e3d39409e41713a92eae2a0924
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d28edc76 d832de63

system/gd/hci/acl_manager/classic_impl.h

+4 −0
Original line number Diff line number Diff line
@@ -629,6 +629,8 @@ struct classic_impl : public security::ISecurityManagerListener { 
    auto view = ReadRemoteSupportedFeaturesCompleteView::Create(packet);

    ASSERT_LOG(view.IsValid(), "Read remote supported features packet invalid");

    uint16_t handle = view.GetConnectionHandle();

    bluetooth::os::LogMetricBluetoothRemoteSupportedFeatures(

        connections.get_address(handle), 0, view.GetLmpFeatures(), handle);

    connections.execute(handle, [=](ConnectionManagementCallbacks* callbacks) {

      callbacks->OnReadRemoteSupportedFeaturesComplete(view.GetLmpFeatures());

    });
@@ -638,6 +640,8 @@ struct classic_impl : public security::ISecurityManagerListener { 
    auto view = ReadRemoteExtendedFeaturesCompleteView::Create(packet);

    ASSERT_LOG(view.IsValid(), "Read remote extended features packet invalid");

    uint16_t handle = view.GetConnectionHandle();

    bluetooth::os::LogMetricBluetoothRemoteSupportedFeatures(

        connections.get_address(handle), view.GetPageNumber(), view.GetExtendedLmpFeatures(), handle);

    connections.execute(handle, [=](ConnectionManagementCallbacks* callbacks) {

      callbacks->OnReadRemoteExtendedFeaturesComplete(

          view.GetPageNumber(), view.GetMaximumPageNumber(), view.GetExtendedLmpFeatures());

system/gd/os/android/metrics.cc

+19 −0
Original line number Diff line number Diff line
@@ -463,6 +463,25 @@ void LogMetricBluetoothDisconnectionReasonReported( 
  }

}



void LogMetricBluetoothRemoteSupportedFeatures(

    const Address& address, uint32_t page, uint64_t features, uint32_t connection_handle) {

  int metric_id = 0;

  if (!address.IsEmpty()) {

    metric_id = MetricIdManager::GetInstance().AllocateId(address);

  }

  int ret = stats_write(BLUETOOTH_REMOTE_SUPPORTED_FEATURES_REPORTED, metric_id, page, features, connection_handle);

  if (ret < 0) {

    LOG_WARN(

        "Failed for LogMetricBluetoothRemoteSupportedFeatures, "

        "metric_id %d, page %d, features %s, connection_handle %d, error %d",

        metric_id,

        page,

        std::to_string(features).c_str(),

        connection_handle,

        ret);

  }

}



void LogMetricBluetoothCodePathCounterMetrics(int32_t key, int64_t count) {

  int ret = stats_write(BLUETOOTH_CODE_PATH_COUNTER, key, count);

  if (ret < 0) {

system/gd/os/host/metrics.cc

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ void LogMetricBluetoothLocalVersions( 
void LogMetricBluetoothDisconnectionReasonReported(

    uint32_t reason, const Address& address, uint32_t connection_handle) {}



void LogMetricBluetoothRemoteSupportedFeatures(

    const Address& address, uint32_t page, uint64_t features, uint32_t connection_handle) {}



void LogMetricBluetoothCodePathCounterMetrics(int32_t key, int64_t count) {}

}  // namespace os

}  // namespace bluetooth

system/gd/os/linux/metrics.cc

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ void LogMetricBluetoothLocalVersions( 
void LogMetricBluetoothDisconnectionReasonReported(

    uint32_t reason, const Address& address, uint32_t connection_handle) {}



void LogMetricBluetoothRemoteSupportedFeatures(

    const Address& address, uint32_t page, uint64_t features, uint32_t connection_handle) {}



void LogMetricBluetoothCodePathCounterMetrics(int32_t key, int64_t count) {}



}  // namespace os

system/gd/os/metrics.h

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ void LogMetricBluetoothLocalVersions( 
void LogMetricBluetoothDisconnectionReasonReported(

    uint32_t reason, const hci::Address& address, uint32_t connection_handle);



void LogMetricBluetoothRemoteSupportedFeatures(

    const hci::Address& address, uint32_t page, uint64_t features, uint32_t connection_handle);



void LogMetricBluetoothCodePathCounterMetrics(int32_t key, int64_t count);

}  // namespace os