commit 857689453ed225e34488d4b02bd723dee8556606
author Sanna Catherine de Treville Wager <scwager@google.com> Wed Jul 26 20:17:30 2017 -0700
committer Sanna Catherine de Treville Wager <scwager@google.com> Mon Jul 31 10:26:04 2017 -0700
tree 5692a2c4e2d902c25a9895e820b229a67b9fa03d
parent 0a3959e84386d8e6fe40832309eeec36a599dc14

Fixed timestamp outlier bug

Test: dumpsys media.log

Change-Id: I8b03feed956100d4cec0a2d9683a8a436323d171

services/audioflinger/FastMixer.cpp

diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index c10fa05..ace586c 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -138,8 +138,6 @@
 
 void FastMixer::onStateChange()
 {
-    // log that audio was turned on/off
-    LOG_AUDIO_STATE();
     const FastMixerState * const current = (const FastMixerState *) mCurrent;
     const FastMixerState * const previous = (const FastMixerState *) mPrevious;
     FastMixerDumpState * const dumpState = (FastMixerDumpState *) mDumpState;
@@ -336,7 +334,13 @@
 
 void FastMixer::onWork()
 {
-    LOG_HIST_TS();
+    // TODO: pass an ID parameter to indicate which time series we want to write to in NBLog.cpp
+    // Or: pass both of these into a single call with a boolean
+    if (mIsWarm) {
+        LOG_HIST_TS();
+    } else {
+        LOG_AUDIO_STATE();
+    }
     const FastMixerState * const current = (const FastMixerState *) mCurrent;
     FastMixerDumpState * const dumpState = (FastMixerDumpState *) mDumpState;
     const FastMixerState::Command command = mCommand;