diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-03-13 15:08:33 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2014-03-14 14:49:36 -0700 |
| commit | 05997e21af6c4517f375def6563af4b9ebe95f39 (patch) | |
| tree | 6a0892e14e34751cd10e11f6f73e92401f540505 /services | |
| parent | 0e0e846f3d86906ff990025981e514d6bcf44d8e (diff) | |
| download | frameworks_av-05997e21af6c4517f375def6563af4b9ebe95f39.zip frameworks_av-05997e21af6c4517f375def6563af4b9ebe95f39.tar.gz frameworks_av-05997e21af6c4517f375def6563af4b9ebe95f39.tar.bz2 | |
Whitespace and comments
Change-Id: I99752cca74a459c4746ea4718acb0115439e50bd
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/Threads.cpp | 3 | ||||
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 779d855..ff0b0a3 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -567,7 +567,6 @@ sp<IAudioTrack> AudioFlinger::createTrack( } pid_t pid = IPCThreadState::self()->getCallingPid(); - client = registerPid_l(pid); ALOGV("createTrack() sessionId: %d", (sessionId == NULL) ? -2 : *sessionId); @@ -1357,8 +1356,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( goto Exit; } - // add client to list - { // scope for mLock + { Mutex::Autolock _l(mLock); thread = checkRecordThread_l(input); if (thread == NULL) { diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 1c46c27..1b0a601 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -1416,7 +1416,6 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTrac // track must be cleared from the caller as the caller has the AF lock goto Exit; } - mTracks.add(track); sp<EffectChain> chain = getEffectChain_l(sessionId); @@ -5053,6 +5052,7 @@ void AudioFlinger::RecordThread::inputStandBy() mInput->stream->common.standby(&mInput->stream->common); } +// RecordThread::createRecordTrack_l() must be called with AudioFlinger::mLock held sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRecordTrack_l( const sp<AudioFlinger::Client>& client, uint32_t sampleRate, @@ -5156,6 +5156,7 @@ sp<AudioFlinger::RecordThread::RecordTrack> AudioFlinger::RecordThread::createRe sendPrioConfigEvent_l(callingPid, tid, kPriorityAudioApp); } } + lStatus = NO_ERROR; Exit: diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 92ed46a..92bc6be 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1773,7 +1773,7 @@ status_t AudioFlinger::RecordHandle::onTransact( // ---------------------------------------------------------------------------- -// RecordTrack constructor must be called with AudioFlinger::mLock held +// RecordTrack constructor must be called with AudioFlinger::mLock and ThreadBase::mLock held AudioFlinger::RecordThread::RecordTrack::RecordTrack( RecordThread *thread, const sp<Client>& client, |