Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3902aade authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 110c432e: am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack... 

am 110c432e: am 3fe1708d: Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo

Merge commit '110c432e6c90c604d955b795f91fe08c35f49e60' into kraken

* commit '110c432e6c90c604d955b795f91fe08c35f49e60':
  Fix isssue 2548710: Native AudioTrack resources never freed.
parents 24117416 c3f48fd3

libs/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);