Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff31fdcd authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where mMixerStatus was set to IDLE"

parents 13dfcd1f 6cb5e64f

services/audioflinger/AudioFlinger.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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);