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

Commit 3f079bb9 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 1d2536f4: Merge "AudioTrack: fix music resume" into klp-dev 

* commit '1d2536f4':
  AudioTrack: fix music resume
parents 3f1d3b97 1d2536f4

media/libmedia/AudioRecord.cpp

+3 −2
Original line number Diff line number Diff line
@@ -979,12 +979,12 @@ bool AudioRecord::AudioRecordThread::threadLoop() 
            return true;

        }

        if (mPausedInt) {

            mPausedInt = false;

            if (mPausedNs > 0) {

                (void) mMyCond.waitRelative(mMyLock, mPausedNs);

            } else {

                mMyCond.wait(mMyLock);

            }

            mPausedInt = false;

            return true;

        }

    }
@@ -1029,8 +1029,9 @@ void AudioRecord::AudioRecordThread::pause() 
void AudioRecord::AudioRecordThread::resume()

{

    AutoMutex _l(mMyLock);

    if (mPaused) {

    if (mPaused || mPausedInt) {

        mPaused = false;

        mPausedInt = false;

        mMyCond.signal();

    }

}

media/libmedia/AudioTrack.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1800,12 +1800,12 @@ bool AudioTrack::AudioTrackThread::threadLoop() 
            return true;

        }

        if (mPausedInt) {

            mPausedInt = false;

            if (mPausedNs > 0) {

                (void) mMyCond.waitRelative(mMyLock, mPausedNs);

            } else {

                mMyCond.wait(mMyLock);

            }

            mPausedInt = false;

            return true;

        }

    }
@@ -1850,8 +1850,9 @@ void AudioTrack::AudioTrackThread::pause() 
void AudioTrack::AudioTrackThread::resume()

{

    AutoMutex _l(mMyLock);

    if (mPaused) {

    if (mPaused || mPausedInt) {

        mPaused = false;

        mPausedInt = false;

        mMyCond.signal();

    }

}