commit 81787e56f8f21407eade5accc50c6da39b8af9b2
author Glenn Kasten <gkasten@google.com> Sun Jun 03 14:40:55 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jun 03 14:40:55 2012 -0700
tree 1d33021d28ad0c469e5a6adc98e7a7d097a65ad5
parent 7dc5b165d4f98a2059eaf1c7fec20b3b5773cd4c
parent 04a4ca4217e9b30342d5865024c340013d7184e8

Merge "Was calculating measured warmup time wrong" into jb-dev

services/audioflinger/FastMixer.cpp

diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index 52effb2..b0af6ed 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -161,6 +161,7 @@
                 coldGen = current->mColdGen;
                 bounds = 0;
                 full = false;
+                oldTsValid = !clock_gettime(CLOCK_MONOTONIC, &oldTs);
             } else {
                 sleepNs = FAST_HOT_IDLE_NS;
             }