commit ccaf898677e1c41c2751bf8d60d9757e83ae700b
author Ray Essick <essick@google.com> Tue Jan 16 12:02:58 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jan 16 21:49:39 2018 +0000
tree cd90dc862524a47f4ea851b848d2c68e73383ed6
parent 68653afbdb69b0f2f019c07b8574e161b6127f96

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
(cherry picked from commit a10a2d361758752715744023b4109e8007fa34d4)

Change-Id: I686b366a77768fcc6bce111075191e67772673af

media/libaudioclient/AudioTrack.cpp

diff --git a/media/libaudioclient/AudioTrack.cpp b/media/libaudioclient/AudioTrack.cpp
index 7670982..a3c66fe 100644
--- a/media/libaudioclient/AudioTrack.cpp
+++ b/media/libaudioclient/AudioTrack.cpp
@@ -189,16 +189,22 @@
     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);