summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-12 18:13:59 -0700
committerGlenn Kasten <gkasten@google.com>2012-03-12 18:13:59 -0700
commitaa4397f07c43bd83bc3100b749401dc3d15e7622 (patch)
tree44ec13ce56037243854454b25072fcc06e63972b
parent73f4bc33e0d458933460250a47c64aa868c05f97 (diff)
downloadframeworks_av-aa4397f07c43bd83bc3100b749401dc3d15e7622.zip
frameworks_av-aa4397f07c43bd83bc3100b749401dc3d15e7622.tar.gz
frameworks_av-aa4397f07c43bd83bc3100b749401dc3d15e7622.tar.bz2
Fix bug where mMixerStatus was set to IDLE
Change-Id: I55df1738fb7ba17ba6caeea6a17557526eac17a7
-rw-r--r--services/audioflinger/AudioFlinger.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index d537a20..81b9464 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1463,7 +1463,7 @@ AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinge
// 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)
{
@@ -2031,7 +2031,6 @@ if (mType == MIXER) {
processConfigEvents();
- mMixerStatus = MIXER_IDLE;
{ // scope for mLock
Mutex::Autolock _l(mLock);