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

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

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

Merge commit '0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8' into eclair-mr2

* commit '0a08029fc9a370c6ef2a2a6fd1d800d9159b61f8':
  Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.
parents 5ddf521e fed9382a

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;

}