diff options
| author | Eric Laurent <elaurent@google.com> | 2010-03-31 23:33:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-31 23:33:52 -0700 |
| commit | 3fe1708d9d204fa63e8abe6e434378d89e963752 (patch) | |
| tree | e401f2432f7bce94a4b56ada86b96646e8117f84 | |
| parent | db3ea3d0064e0aeae350bca5e548e67f50f06982 (diff) | |
| parent | 71f37cd8a175ee00635cb91506d6810fd02b5b51 (diff) | |
| download | frameworks_base-3fe1708d9d204fa63e8abe6e434378d89e963752.zip frameworks_base-3fe1708d9d204fa63e8abe6e434378d89e963752.tar.gz frameworks_base-3fe1708d9d204fa63e8abe6e434378d89e963752.tar.bz2 | |
Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
| -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 815a367..7166c89 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -1488,7 +1488,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); |