commit fd83fbf5ead098070bae674b20e6f87f45ab5d4c
author Glenn Kasten <gkasten@google.com> Tue Mar 13 07:16:44 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 13 07:16:44 2012 -0700
tree 943a0945c076afc9536c3ddf96c50475bf9d519e
parent aa4397f07c43bd83bc3100b749401dc3d15e7622
parent 5798d4ebf236357a4b13246f40e52b90a34d09a4

Merge "Clean up assertion checks"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 767c348..fad7087 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1464,7 +1464,7 @@
         // but it would be safer to explicitly pass initial masterVolume as parameter
         mMasterVolume(audioFlinger->masterVolumeSW_l()),
         mLastWriteTime(0), mNumWrites(0), mNumDelayedWrites(0), mInWrite(false),
-        // mMixerStatus
+        mMixerStatus(MIXER_IDLE),
         mPrevMixerStatus(MIXER_IDLE),
         standbyDelay(AudioFlinger::mStandbyTimeInNsecs)
 {
@@ -2032,7 +2032,6 @@
 
         processConfigEvents();
 
-        mMixerStatus = MIXER_IDLE;
         { // scope for mLock
 
             Mutex::Autolock _l(mLock);