Skip to content

Commit ff31fdc

Browse files
gkastenAndroid (Google) Code Review
authored andcommitted
Merge "Fix bug where mMixerStatus was set to IDLE"
2 parents 13dfcd1 + 6cb5e64 commit ff31fdc

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

services/audioflinger/AudioFlinger.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinge
14631463
// but it would be safer to explicitly pass initial masterVolume as parameter
14641464
mMasterVolume(audioFlinger->masterVolumeSW_l()),
14651465
mLastWriteTime(0), mNumWrites(0), mNumDelayedWrites(0), mInWrite(false),
1466-
// mMixerStatus
1466+
mMixerStatus(MIXER_IDLE),
14671467
mPrevMixerStatus(MIXER_IDLE),
14681468
standbyDelay(AudioFlinger::mStandbyTimeInNsecs)
14691469
{
@@ -2031,7 +2031,6 @@ if (mType == MIXER) {
20312031

20322032
processConfigEvents();
20332033

2034-
mMixerStatus = MIXER_IDLE;
20352034
{ // scope for mLock
20362035

20372036
Mutex::Autolock _l(mLock);

0 commit comments

Comments
 (0)