drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 090c60bb: Merge change I73b60354 into eclair

Browse Source 
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-mr2

* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
This commit is contained in:
Eric Laurent
2009-11-09 16:15:15 -08:00
committed by Android Git Automerger
parent e8341ebbc6 090c60bb9d
commit 756e75cfcf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/audioflinger/AudioFlinger.cpp
View File

@ -1018,7 +1018,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTra
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
track = new Track(this, client, streamType, sampleRate, format, track = new Track(this, client, streamType, sampleRate, format,
channelCount, frameCount, sharedBuffer); channelCount, frameCount, sharedBuffer);
if (track->getCblk() == NULL) { if (track->getCblk() == NULL || track->name() < 0) {
lStatus = NO_MEMORY; lStatus = NO_MEMORY;
goto Exit; goto Exit;
} }