diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-05-19 08:35:21 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-05-19 08:35:21 -0700 |
| commit | a3e764551413bead7608c4e0396afc5070b8e1c8 (patch) | |
| tree | 454ae20165de6777208afb02e4d6c1d7e2e58327 | |
| parent | e02a63f012b69ce60a94de5980a1c615b26ff9c5 (diff) | |
| parent | 42fb2ce98ae9d73b1f2a57246a1e1ccc63324fd0 (diff) | |
| download | frameworks_base-a3e764551413bead7608c4e0396afc5070b8e1c8.zip frameworks_base-a3e764551413bead7608c4e0396afc5070b8e1c8.tar.gz frameworks_base-a3e764551413bead7608c4e0396afc5070b8e1c8.tar.bz2 | |
Merge "Fix isssue 2548710: Native AudioTrack resources never freed."
| -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 ecfe1e0..5720f90 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -1344,7 +1344,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track // for all its buffers to be filled before processing it mAudioMixer->setActiveTrack(track->name()); if (cblk->framesReady() && (track->isReady() || track->isStopped()) && - !track->isPaused()) + !track->isPaused() && !track->isTerminated()) { //LOGV("track %d u=%08x, s=%08x [OK] on thread %p", track->name(), cblk->user, cblk->server, this); |