diff options
| author | Haynes Mathew George <hgeorge@codeaurora.org> | 2013-12-13 15:40:13 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@android.com> | 2014-03-06 10:44:13 -0800 |
| commit | 6cbccee701e74fa43a5ea49c15af7dd3267b6699 (patch) | |
| tree | 90fa3e762bead3f0dca419b14ee992100ba4c454 /services/audioflinger/AudioFlinger.cpp | |
| parent | 525b099ada155d6654300cb2e5d8c1a09f4eb8ba (diff) | |
| download | frameworks_av-6cbccee701e74fa43a5ea49c15af7dd3267b6699.zip frameworks_av-6cbccee701e74fa43a5ea49c15af7dd3267b6699.tar.gz frameworks_av-6cbccee701e74fa43a5ea49c15af7dd3267b6699.tar.bz2 | |
audioflinger: Fix for a deadlock in track creation
AudioFlinger enters a deadlock (with itself) on trying to free a
RecordTrack or Track object that failed initialization. Clear this
bad object from the caller instead.
Bug: 12423233
Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
Diffstat (limited to 'services/audioflinger/AudioFlinger.cpp')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index e9c38e3..26dac95 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -513,6 +513,8 @@ sp<IAudioTrack> AudioFlinger::createTrack( track = thread->createTrack_l(client, streamType, sampleRate, format, channelMask, frameCount, sharedBuffer, lSessionId, flags, tid, clientUid, &lStatus); + LOG_ALWAYS_FATAL_IF((lStatus == NO_ERROR) && (track == 0)); + // we don't abort yet if lStatus != NO_ERROR; there is still work to be done regardless // move effect chain to this output thread if an effect on same session was waiting // for a track to be created @@ -1291,7 +1293,7 @@ sp<IAudioRecord> AudioFlinger::openRecord( frameCount, lSessionId, IPCThreadState::self()->getCallingUid(), flags, tid, &lStatus); - LOG_ALWAYS_FATAL_IF((recordTrack != 0) != (lStatus == NO_ERROR)); + LOG_ALWAYS_FATAL_IF((lStatus == NO_ERROR) && (recordTrack == 0)); } if (lStatus != NO_ERROR) { // remove local strong reference to Client before deleting the RecordTrack so that the |