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

Commit fed9382a authored by Eric Laurent's avatar Eric Laurent
Browse files

Fix issue 2306779: Runtime restart - Init failed at android.media.ToneGenerator. 

The ToneGenerator failed to initialize because no more tracks were available in AudioFlinger mixer.

All tracks were used because the duplicating output was failing to free the tracks on audio hardware output mixer when exiting due to a misplaced test on output activity: output tracks where only freed if the duplicating output was active when exiting.

The fix consists in freeing the output tracks when the duplicating thread is destroyed without condition.
parent 0aa2563b

libs/audioflinger/AudioFlinger.cpp

+4 −12
Original line number Diff line number Diff line
@@ -1111,7 +1111,6 @@ void AudioFlinger::PlaybackThread::destroyTrack_l(const sp<Track>& track) 
{

    track->mState = TrackBase::TERMINATED;

    if (mActiveTracks.indexOf(track) < 0) {

        LOGV("remove track (%d) and delete from mixer", track->name());

        mTracks.remove(track);

        deleteTrackName_l(track->name());

    }
@@ -1511,6 +1510,7 @@ int AudioFlinger::MixerThread::getTrackName_l() 
// deleteTrackName_l() must be called with ThreadBase::mLock held

void AudioFlinger::MixerThread::deleteTrackName_l(int name)

{

    LOGV("remove track (%d) and delete from mixer", name);

    mAudioMixer->deleteTrackName(name);

}
@@ -1922,6 +1922,9 @@ AudioFlinger::DuplicatingThread::DuplicatingThread(const sp<AudioFlinger>& audio 


AudioFlinger::DuplicatingThread::~DuplicatingThread()

{

    for (size_t i = 0; i < mOutputTracks.size(); i++) {

        mOutputTracks[i]->destroy();

    }

    mOutputTracks.clear();

}
@@ -2044,17 +2047,6 @@ bool AudioFlinger::DuplicatingThread::threadLoop() 
        outputTracks.clear();

    }



    { // scope for the mLock



        Mutex::Autolock _l(mLock);

        if (!mStandby) {

            LOGV("DuplicatingThread() exiting out of standby");

            for (size_t i = 0; i < mOutputTracks.size(); i++) {

                mOutputTracks[i]->destroy();

            }

        }

    }



    return false;

}