diff options
| author | Eric Laurent <elaurent@google.com> | 2010-04-09 09:06:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-09 09:06:51 -0700 |
| commit | 8e35fad15efa84cdc6755071fe5b7d14b539b75b (patch) | |
| tree | 12bf653f5775285f3fa30302f0cce134fce9a8c7 /libs | |
| parent | 222813545275c36ef7d832e6ee1cdaec81da9e16 (diff) | |
| parent | 6bde88b9a95761921e5143eb4b7b38d3a17778f5 (diff) | |
| download | frameworks_base-8e35fad15efa84cdc6755071fe5b7d14b539b75b.zip frameworks_base-8e35fad15efa84cdc6755071fe5b7d14b539b75b.tar.gz frameworks_base-8e35fad15efa84cdc6755071fe5b7d14b539b75b.tar.bz2 | |
am 6bde88b9: am 2dc3da60: am 1921527c: am 9da7730d: Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
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 7166c89..2414e8d 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -1867,7 +1867,7 @@ bool AudioFlinger::DirectOutputThread::threadLoop() // The first time a track is added we wait // for all its buffers to be filled before processing it if (cblk->framesReady() && (track->isReady() || track->isStopped()) && - !track->isPaused()) + !track->isPaused() && !track->isTerminated()) { //LOGV("track %d u=%08x, s=%08x [OK]", track->name(), cblk->user, cblk->server); |