From a10a2d361758752715744023b4109e8007fa34d4 Mon Sep 17 00:00:00 2001
From: Ray Essick <essick@google.com>
Date: Tue, 16 Jan 2018 12:02:58 -0800
Subject: [PATCH] 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
---
 media/libaudioclient/AudioTrack.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index 76709828d1..a3c66fe700 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -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);