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

Commit 79459c62 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "MediaMetrics: Sync to google3 MediaMetricsAudioTrackStatusReported"

parents 09c9e3a9 cb40b98b

services/mediametrics/AudioAnalytics.cpp

+4 −4
Original line number Diff line number Diff line
@@ -179,10 +179,10 @@ static constexpr const char * const AudioTrackStatusFields[] { 
    "mediametrics_audiotrackstatus_reported",

    "status",

    "debug_message",

    "sub_code",

    "status_subcode",

    "uid",

    "event",

    "flags",

    "output_flags",

    "content_type",

    "usage",

    "encoding",
@@ -542,8 +542,8 @@ void AudioAnalytics::processStatus(const std::shared_ptr<const mediametrics::Ite 
        const int atom_status = types::lookup<types::STATUS, int32_t>(statusString);



        // currently we only send create status events.

        const int32_t event =

                android::util::MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__EVENT__EVENT_CREATE;

        const int32_t event = android::util::

                MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__EVENT__AUDIO_TRACK_EVENT_CREATE;



        // The following fields should all be present in a create event.

        std::string flagsStr;

services/mediametrics/AudioTypes.cpp

+2 −2
Original line number Diff line number Diff line
@@ -196,9 +196,9 @@ const std::unordered_map<std::string, int32_t>& getStatusMap() { 
    // DO NOT MODIFY VALUES(OK to add new ones).

    static std::unordered_map<std::string, int32_t> map {

        {"",

            util::MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__STATUS__OK},

            util::MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__STATUS__NO_ERROR},

        {AMEDIAMETRICS_PROP_STATUS_VALUE_OK,

            util::MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__STATUS__OK},

            util::MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__STATUS__NO_ERROR},

        {AMEDIAMETRICS_PROP_STATUS_VALUE_ARGUMENT,

            util::MEDIAMETRICS_AUDIO_TRACK_STATUS_REPORTED__STATUS__ERROR_ARGUMENT},

        {AMEDIAMETRICS_PROP_STATUS_VALUE_IO,