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

Commit 6d07d9bd authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 029838a9: am 7f91e5e0: Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-dev 

* commit '029838a9':
  audioflinger: fix ro.audio.silent in offload mode
parents bd091600 029838a9

services/audioflinger/Threads.cpp

+4 −2
Original line number Diff line number Diff line
@@ -3520,7 +3520,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::DirectOutputThread::prep 


            if (track->mFillingUpStatus == Track::FS_FILLED) {

                track->mFillingUpStatus = Track::FS_ACTIVE;

                mLeftVolFloat = mRightVolFloat = 0;

                // make sure processVolume_l() will apply new volume even if 0

                mLeftVolFloat = mRightVolFloat = -1.0;

                if (track->mState == TrackBase::RESUMING) {

                    track->mState = TrackBase::ACTIVE;

                }
@@ -3905,7 +3906,8 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr 
            ALOGVV("OffloadThread: track %d s=%08x [OK]", track->name(), cblk->mServer);

            if (track->mFillingUpStatus == Track::FS_FILLED) {

                track->mFillingUpStatus = Track::FS_ACTIVE;

                mLeftVolFloat = mRightVolFloat = 0;

                // make sure processVolume_l() will apply new volume even if 0

                mLeftVolFloat = mRightVolFloat = -1.0;

                if (track->mState == TrackBase::RESUMING) {

                    if (mPausedBytesRemaining) {

                        // Need to continue write that was interrupted