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

Commit c9c7d934 authored by Ray Essick's avatar Ray Essick Committed by Android (Google) Code Review
Browse files

Merge "prep for mediametrics in module" into main

parents b6144826 338f753f

services/mediametrics/AudioAnalytics.cpp

+6 −2
Original line number Diff line number Diff line
@@ -315,7 +315,9 @@ int sendToStatsd(Types ... args) 
    int result = 0;



#ifdef STATSD_ENABLE

    if (__builtin_available(android 33, *)) {

        result = stats::media_metrics::stats_write(args...);

    }

#endif

    return result;

}
@@ -331,7 +333,9 @@ std::pair<int, std::string> sendToStatsd(const char * const (& fields)[N], Types 
    std::stringstream ss;



#ifdef STATSD_ENABLE

    if (__builtin_available(android 33, *)) {

        result = stats::media_metrics::stats_write(args...);

    }

    ss << "result:" << result;

#endif

    ss << " { ";

services/mediametrics/AudioPowerUsage.cpp

+6 −1
Original line number Diff line number Diff line
@@ -174,7 +174,11 @@ void AudioPowerUsage::sendItem(const std::shared_ptr<const mediametrics::Item>& 
    const int32_t duration_secs = (int32_t)(duration_ns / NANOS_PER_SECOND);

    const int32_t min_volume_duration_secs = (int32_t)(min_volume_duration_ns / NANOS_PER_SECOND);

    const int32_t max_volume_duration_secs = (int32_t)(max_volume_duration_ns / NANOS_PER_SECOND);

    const int result = stats::media_metrics::stats_write(stats::media_metrics::AUDIO_POWER_USAGE_DATA_REPORTED,

    int result = 0;



    if (__builtin_available(android 33, *)) {

        result = stats::media_metrics::stats_write(

                                         stats::media_metrics::AUDIO_POWER_USAGE_DATA_REPORTED,

                                         audio_device,

                                         duration_secs,

                                         (float)volume,
@@ -183,6 +187,7 @@ void AudioPowerUsage::sendItem(const std::shared_ptr<const mediametrics::Item>& 
                                         (float)min_volume,

                                         max_volume_duration_secs,

                                         (float)max_volume);

    }



    std::stringstream log;

    log << "result:" << result << " {"