diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-11-06 23:34:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-06 23:34:09 +0000 |
| commit | 09faf14b434bec0d184fecec947e3d750bcc64ff (patch) | |
| tree | a598a00077e6ed9ca33ff3bb71f3b4faae8fa315 | |
| parent | d6fadf0479b489b09b764070974d8a59855ede64 (diff) | |
| parent | 93e471f620454f7de73d190521568b1e25879767 (diff) | |
| download | frameworks_av-09faf14b434bec0d184fecec947e3d750bcc64ff.zip frameworks_av-09faf14b434bec0d184fecec947e3d750bcc64ff.tar.gz frameworks_av-09faf14b434bec0d184fecec947e3d750bcc64ff.tar.bz2 | |
Merge "Rename standby methods"
| -rw-r--r-- | services/audioflinger/Threads.cpp | 8 | ||||
| -rw-r--r-- | services/audioflinger/Threads.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index fcb4179..16c35a2 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -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(); diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h index 8a859f5..cbc3827 100644 --- a/services/audioflinger/Threads.h +++ b/services/audioflinger/Threads.h @@ -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(); |