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

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

Merge "Rename standby methods"

parents d6fadf04 93e471f6
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -4450,7 +4450,7 @@ bool AudioFlinger::RecordThread::threadLoop()
            // make a stable copy of mActiveTrack
            activeTrack = mActiveTrack;
            if (activeTrack == 0) {
                standby();
                standbyIfNotAlreadyInStandby();
                // exitPending() can't become true here
                releaseWakeLock_l();
                ALOGV("RecordThread: loop stopping");
@@ -4470,7 +4470,7 @@ bool AudioFlinger::RecordThread::threadLoop()
            activeTrackState = activeTrack->mState;
            switch (activeTrackState) {
            case TrackBase::PAUSING:
                standby();
                standbyIfNotAlreadyInStandby();
                mActiveTrack.clear();
                mStartStopCond.broadcast();
                doSleep = true;
@@ -4648,7 +4648,7 @@ bool AudioFlinger::RecordThread::threadLoop()
        // effectChains doesn't need to be cleared, since it is cleared by destructor at scope end
    }

    standby();
    standbyIfNotAlreadyInStandby();

    {
        Mutex::Autolock _l(mLock);
@@ -4666,7 +4666,7 @@ bool AudioFlinger::RecordThread::threadLoop()
    return false;
}

void AudioFlinger::RecordThread::standby()
void AudioFlinger::RecordThread::standbyIfNotAlreadyInStandby()
{
    if (!mStandby) {
        inputStandBy();
+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ private:
            void    clearSyncStartEvent();

            // Enter standby if not already in standby, and set mStandby flag
            void    standby();
            void    standbyIfNotAlreadyInStandby();

            // Call the HAL standby method unconditionally, and don't change mStandby flag
            void    inputStandBy();