Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '38f6bdc4187f27f86c7f77c88095c663e005dbf4' into eclair-mr2-plus-aosp

* commit '38f6bdc4187f27f86c7f77c88095c663e005dbf4':
  Fix issue  2306779: Runtime restart - Init failed at android.media.ToneGenerator.
This commit is contained in:
Eric Laurent
2009-12-07 12:38:45 -08:00
committed by Android Git Automerger
parent 2109e68011 38f6bdc418
commit bf831e0de0
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/audioflinger/AudioFlinger.cpp
View File

@@ -1111,7 +1111,6 @@ void AudioFlinger::PlaybackThread::destroyTrack_l(const sp<Track>& track)
{ {
track->mState = TrackBase::TERMINATED; track->mState = TrackBase::TERMINATED;
if (mActiveTracks.indexOf(track) < 0) { if (mActiveTracks.indexOf(track) < 0) {
LOGV("remove track (%d) and delete from mixer", track->name());
mTracks.remove(track); mTracks.remove(track);
deleteTrackName_l(track->name()); deleteTrackName_l(track->name());
} }
@@ -1511,6 +1510,7 @@ int AudioFlinger::MixerThread::getTrackName_l()
// deleteTrackName_l() must be called with ThreadBase::mLock held // deleteTrackName_l() must be called with ThreadBase::mLock held
void AudioFlinger::MixerThread::deleteTrackName_l(int name) void AudioFlinger::MixerThread::deleteTrackName_l(int name)
{ {
LOGV("remove track (%d) and delete from mixer", name);
mAudioMixer->deleteTrackName(name); mAudioMixer->deleteTrackName(name);
} }
@@ -1922,6 +1922,9 @@ AudioFlinger::DuplicatingThread::DuplicatingThread(const sp<AudioFlinger>& audio
AudioFlinger::DuplicatingThread::~DuplicatingThread() AudioFlinger::DuplicatingThread::~DuplicatingThread()
{ {
for (size_t i = 0; i < mOutputTracks.size(); i++) {
mOutputTracks[i]->destroy();
}
mOutputTracks.clear(); mOutputTracks.clear();
} }
@@ -2044,17 +2047,6 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
outputTracks.clear(); 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; return false;
} }