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

Commit 7dfbdb62 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "Metric: Log extended smp pairing events" into tm-qpr-dev am: d2aa7b8a 

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



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

system/gd/os/android/metrics.cc

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ void LogMetricReadTxPowerLevelResult( 
}



void LogMetricSmpPairingEvent(

    const Address& address, uint8_t smp_cmd, android::bluetooth::DirectionEnum direction, uint8_t smp_fail_reason) {

    const Address& address, uint16_t smp_cmd, android::bluetooth::DirectionEnum direction, uint16_t smp_fail_reason) {

  int metric_id = 0;

  if (!address.IsEmpty()) {

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

system/gd/os/host/metrics.cc

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void LogMetricSdpAttribute( 
    const char* attribute_value) {}



void LogMetricSmpPairingEvent(

    const Address& address, uint8_t smp_cmd, android::bluetooth::DirectionEnum direction, uint8_t smp_fail_reason) {}

    const Address& address, uint16_t smp_cmd, android::bluetooth::DirectionEnum direction, uint16_t smp_fail_reason) {}



void LogMetricA2dpPlaybackEvent(const Address& address, int playback_state, int audio_coding_mode) {}

system/gd/os/linux/metrics.cc

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void LogMetricSdpAttribute( 
    const char* attribute_value) {}



void LogMetricSmpPairingEvent(

    const Address& address, uint8_t smp_cmd, android::bluetooth::DirectionEnum direction, uint8_t smp_fail_reason) {}

    const Address& address, uint16_t smp_cmd, android::bluetooth::DirectionEnum direction, uint16_t smp_fail_reason) {}



void LogMetricA2dpPlaybackEvent(const Address& address, int playback_state, int audio_coding_mode) {}

system/gd/os/metrics.h

+4 −1
Original line number Diff line number Diff line
@@ -166,7 +166,10 @@ void LogMetricReadTxPowerLevelResult( 
 * @param smp_fail_reason SMP pairing failure reason code from SMP spec

 */

void LogMetricSmpPairingEvent(

    const hci::Address& address, uint8_t smp_cmd, android::bluetooth::DirectionEnum direction, uint8_t smp_fail_reason);

    const hci::Address& address,

    uint16_t smp_cmd,

    android::bluetooth::DirectionEnum direction,

    uint16_t smp_fail_reason);



/**

 * Logs there is an event related Bluetooth classic pairing

system/main/shim/metrics_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ void LogMetricReadTxPowerLevelResult(const RawAddress& raw_address, 
                                                 transmit_power_level);

}



void LogMetricSmpPairingEvent(const RawAddress& raw_address, uint8_t smp_cmd,

void LogMetricSmpPairingEvent(const RawAddress& raw_address, uint16_t smp_cmd,

                              android::bluetooth::DirectionEnum direction,

                              uint8_t smp_fail_reason) {

                              uint16_t smp_fail_reason) {

  Address address = bluetooth::ToGdAddress(raw_address);

  bluetooth::os::LogMetricSmpPairingEvent(address, smp_cmd, direction,

                                          smp_fail_reason);