diff options
| author | Eric Laurent <elaurent@google.com> | 2009-11-09 16:30:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-09 16:30:29 -0800 |
| commit | aaad67613751dc53b6becc65b5f1abce2ec67b7c (patch) | |
| tree | 9af6b387bca0923fd2b75651be957902c2926d36 /libs | |
| parent | 7ebdc03a95c39b00cf8ce4d56e5f9aa78290ad62 (diff) | |
| parent | c6aaa09b7075f00e2cff543b50bc84bbdd133d7b (diff) | |
| download | frameworks_base-aaad67613751dc53b6becc65b5f1abce2ec67b7c.zip frameworks_base-aaad67613751dc53b6becc65b5f1abce2ec67b7c.tar.gz frameworks_base-aaad67613751dc53b6becc65b5f1abce2ec67b7c.tar.bz2 | |
am c6aaa09b: am 756e75cf: am 090c60bb: Merge change I73b60354 into eclair
Merge commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b'
* commit 'c6aaa09b7075f00e2cff543b50bc84bbdd133d7b':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/audioflinger/AudioFlinger.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index 230e833..ebd470f 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -1018,7 +1018,7 @@ sp<AudioFlinger::PlaybackThread::Track> AudioFlinger::PlaybackThread::createTra Mutex::Autolock _l(mLock); track = new Track(this, client, streamType, sampleRate, format, channelCount, frameCount, sharedBuffer); - if (track->getCblk() == NULL) { + if (track->getCblk() == NULL || track->name() < 0) { lStatus = NO_MEMORY; goto Exit; } |