commit 6c009eb5ff5f999b1d9bc6978d3213f9f797903f
author Eric Laurent <elaurent@google.com> Mon Jan 25 11:46:43 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 25 11:46:43 2010 -0800
tree dd15637b83ee39773c557cc172127eb79bc605a6
parent 213addfaf4b359c69da4e9b4490c511d116845bb
parent 0ef583f785528ef2785e6149d5964004cd1016b0

Merge "Fix issue 2363154: Speech synthesis fails to start over A2DP after media server process crash."

media/libmedia/AudioSystem.cpp

diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index 5352234..e1b1776 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -348,6 +348,9 @@
     Mutex::Autolock _l(AudioSystem::gLock);
 
     AudioSystem::gAudioFlinger.clear();
+    // clear output handles and stream to output map caches
+    AudioSystem::gStreamOutputMap.clear();
+    AudioSystem::gOutputs.clear();
 
     if (gAudioErrorCallback) {
         gAudioErrorCallback(DEAD_OBJECT);