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

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

am 090c60bb: Merge change I73b60354 into eclair 

Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-mr2

* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
  AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
parents d0c35bbc 78c0b4af

libs/audioflinger/AudioFlinger.cpp

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

        }