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

Commit a10a2d36 authored by Ray Essick's avatar Ray Essick
Browse files

prevent null pointer in audio track media metrics 

Disable a piece of audio track metrics code that triggered a
null pointer exception.

Bug: 72027185
Test: manual
parent d6be64a3

media/libaudioclient/AudioTrack.cpp

+6 −0
Original line number Diff line number Diff line
@@ -189,16 +189,22 @@ void AudioTrack::MediaMetrics::gather(const AudioTrack *track) 
    static constexpr char kAudioTrackUsage[] = "android.media.audiotrack.usage";

    static constexpr char kAudioTrackSampleRate[] = "android.media.audiotrack.samplerate";

    static constexpr char kAudioTrackChannelMask[] = "android.media.audiotrack.channelmask";

#if 0

    // XXX: disabled temporarily for b/72027185

    static constexpr char kAudioTrackUnderrunFrames[] = "android.media.audiotrack.underrunframes";

#endif

    static constexpr char kAudioTrackStartupGlitch[] = "android.media.audiotrack.glitch.startup";



    // constructor guarantees mAnalyticsItem is valid



#if 0

    // XXX: disabled temporarily for b/72027185

    // must gather underrun info before cleaning mProxy information.

    const int32_t underrunFrames = track->getUnderrunFrames();

    if (underrunFrames != 0) {

        mAnalyticsItem->setInt32(kAudioTrackUnderrunFrames, underrunFrames);

    }

#endif



    if (track->mTimestampStartupGlitchReported) {

        mAnalyticsItem->setInt32(kAudioTrackStartupGlitch, 1);