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

Commit 9ecf12a3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "[BluetoothMetrics] Adding logging for SMP Pairing cancellation Test: m...

Merge "[BluetoothMetrics] Adding logging for SMP Pairing cancellation Test: m statsd_testdrive && statsd_testdrive 167 and run LE Pairing" into main
parents 80d0f1ce 12c74126
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ typedef enum : uint8_t {

  SMP_CONN_TOUT = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0B),           /* 0x19 */
  SMP_SIRK_DEVICE_INVALID = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0C), /* 0x1a */
  SMP_USER_CANCELLED = (SMP_MAX_FAIL_RSN_PER_SPEC + 0x0D),   /* 0x1b */
} tSMP_STATUS;

#ifndef CASE_RETURN_TEXT
@@ -91,6 +92,7 @@ inline std::string smp_status_text(const tSMP_STATUS& status) {
    CASE_RETURN_TEXT(SMP_FAIL);
    CASE_RETURN_TEXT(SMP_CONN_TOUT);
    CASE_RETURN_TEXT(SMP_SIRK_DEVICE_INVALID);
    CASE_RETURN_TEXT(SMP_USER_CANCELLED);
    default:
      return base::StringPrintf("UNKNOWN[%hhu]", status);
  }
+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@
#include "stack/include/bt_hdr.h"
#include "stack/include/bt_octets.h"
#include "stack/include/btm_log_history.h"
#include "stack/include/smp_status.h"
#include "stack/include/stack_metrics_logging.h"
#include "types/raw_address.h"

@@ -327,6 +328,9 @@ void smp_log_metrics(const RawAddress& bd_addr, bool is_outgoing,
  if (raw_cmd == SMP_OPCODE_PAIRING_FAILED && buf_len >= 1) {
    STREAM_TO_UINT8(failure_reason, p_buf);
  }
  if (smp_cb.is_pair_cancel) {
    failure_reason = SMP_USER_CANCELLED; // Tracking pairing cancellations
  }
  uint16_t metric_cmd =
      is_over_br ? SMP_METRIC_COMMAND_BR_FLAG : SMP_METRIC_COMMAND_LE_FLAG;
  metric_cmd |= static_cast<uint16_t>(raw_cmd);