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

Commit 32daf6cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add metric A2DP_SESSION_REPORTED" into main am: 49fb3003 

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



Change-Id: Ief801cd313b3a77320215e778d5e28dcba23f0fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba8c0748 49fb3003

system/gd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ cc_defaults { 
    ],

    include_dirs: [

        "packages/modules/Bluetooth/system/include",

        "packages/modules/Bluetooth/system/stack/include",

        "packages/modules/Bluetooth/system/types",

    ],

    export_static_lib_headers: ["libbluetooth_rust_interop"],

system/gd/os/android/metrics.cc

+23 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <bluetooth/log.h>

#include <statslog_bt.h>



#include "a2dp_constants.h"

#include "common/audit_log.h"

#include "common/metric_id_manager.h"

#include "common/strings.h"
@@ -163,37 +164,53 @@ void LogMetricA2dpPlaybackEvent(const Address& address, int playback_state, int 
  }

}



void LogMetricA2dpSessionMetricsEvent(

        const hci::Address& /* address */, int64_t /* audio_duration_ms */,

        int /* media_timer_min_ms */, int /* media_timer_max_ms */, int /* media_timer_avg_ms */,

        int /* total_scheduling_count */, int /* buffer_overruns_max_count */,

        int /* buffer_overruns_total */, float /* buffer_underruns_average */,

        int /* buffer_underruns_count */, int64_t codec_index, bool /* is_a2dp_offload */) {

void LogMetricA2dpSessionMetricsEvent(const hci::Address& /* address */, int64_t audio_duration_ms,

                                      int media_timer_min_ms, int media_timer_max_ms,

                                      int media_timer_avg_ms, int total_scheduling_count,

                                      int buffer_overruns_max_count, int buffer_overruns_total,

                                      float buffer_underruns_average, int buffer_underruns_count,

                                      int64_t codec_index, bool is_a2dp_offload) {

  char const* metric_id = nullptr;

  uint64_t codec_id = -1;

  switch (codec_index) {

    case BTAV_A2DP_CODEC_INDEX_SOURCE_SBC:

      metric_id = "bluetooth.value_sbc_codec_usage_over_a2dp";

      codec_id = A2DP_CODEC_ID_SBC;

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_AAC:

      metric_id = "bluetooth.value_aac_codec_usage_over_a2dp";

      codec_id = A2DP_CODEC_ID_AAC;

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX:

      metric_id = "bluetooth.value_aptx_codec_usage_over_a2dp";

      codec_id = A2DP_CODEC_ID_APTX;

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD:

      metric_id = "bluetooth.value_aptx_hd_codec_usage_over_a2dp";

      codec_id = A2DP_CODEC_ID_APTX_HD;

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_LDAC:

      metric_id = "bluetooth.value_ldac_codec_usage_over_a2dp";

      codec_id = A2DP_CODEC_ID_LDAC;

      break;

    case BTAV_A2DP_CODEC_INDEX_SOURCE_OPUS:

      metric_id = "bluetooth.value_opus_codec_usage_over_a2dp";

      codec_id = A2DP_CODEC_ID_OPUS;

      break;

    default:

      return;

  }



  android::expresslog::Counter::logIncrement(metric_id);



  int ret = stats_write(A2DP_SESSION_REPORTED, audio_duration_ms, media_timer_min_ms,

                        media_timer_max_ms, media_timer_avg_ms, total_scheduling_count,

                        buffer_overruns_max_count, buffer_overruns_total, buffer_underruns_average,

                        buffer_underruns_count, codec_id, is_a2dp_offload);



  if (ret < 0) {

    log::warn("failed to log a2dp_session_reported");

  }

}



void LogMetricHfpPacketLossStats(const Address& /* address */, int /* num_decoded_frames */,