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

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

Merge "AudioTrack/AudioRecord: Log setPreferredDevice" into main

parents f2e8d6a7 d0239ae2

media/libaudioclient/AudioRecord.cpp

+11 −0
Original line number Diff line number Diff line
@@ -680,6 +680,17 @@ status_t AudioRecord::setInputDevice(audio_port_handle_t deviceId) { 
    AutoMutex lock(mLock);

    ALOGV("%s(%d): deviceId=%d mSelectedDeviceId=%d",

            __func__, mPortId, deviceId, mSelectedDeviceId);

    const int64_t beginNs = systemTime();

    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

                .set(AMEDIAMETRICS_PROP_CALLERNAME,

                     mCallerName.empty()

                     ? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN

                     : mCallerName.c_str())

                .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_SETPREFERREDDEVICE)

                .set(AMEDIAMETRICS_PROP_EXECUTIONTIMENS, (int64_t)(systemTime() - beginNs))

                .set(AMEDIAMETRICS_PROP_SELECTEDDEVICEID, (int32_t)deviceId)

                .record(); });



    if (mSelectedDeviceId != deviceId) {

        mSelectedDeviceId = deviceId;

media/libaudioclient/AudioTrack.cpp

+12 −0
Original line number Diff line number Diff line
@@ -1676,6 +1676,18 @@ status_t AudioTrack::setOutputDevice(audio_port_handle_t deviceId) { 
    AutoMutex lock(mLock);

    ALOGV("%s(%d): deviceId=%d mSelectedDeviceId=%d",

            __func__, mPortId, deviceId, mSelectedDeviceId);

    const int64_t beginNs = systemTime();

    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

                .set(AMEDIAMETRICS_PROP_CALLERNAME,

                     mCallerName.empty()

                     ? AMEDIAMETRICS_PROP_CALLERNAME_VALUE_UNKNOWN

                     : mCallerName.c_str())

                .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_SETPREFERREDDEVICE)

                .set(AMEDIAMETRICS_PROP_EXECUTIONTIMENS, (int64_t)(systemTime() - beginNs))

                .set(AMEDIAMETRICS_PROP_SELECTEDDEVICEID, (int32_t)deviceId)

                .record(); });



    if (mSelectedDeviceId != deviceId) {

        mSelectedDeviceId = deviceId;

        if (mStatus == NO_ERROR) {

media/libmediametrics/include/MediaMetricsConstants.h

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ 
#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETLOGSESSIONID  "setLogSessionId" // AudioTrack, Record

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETPLAYBACKPARAM "setPlaybackParam" // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETPLAYERIID "setPlayerIId" // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETPREFERREDDEVICE "setPreferredDevice" // AudioTrack, Record

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETSAMPLERATE "setSampleRate" // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETSTARTTHRESHOLD "setStartThreshold" // AudioTrack

#define AMEDIAMETRICS_PROP_EVENT_VALUE_SETVOICEVOLUME   "setVoiceVolume" // AudioFlinger