commit b283374cbf79dc5a36f1eef0015d7baf8881792e
author Glenn Kasten <gkasten@google.com> Mon Jul 29 17:06:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 29 17:06:18 2013 +0000
tree b2f1680b6c3c3094a50176e234f8f8ca424f0058
parent bd4c4fbb3b073e48963185d11a15da1fa18d2e54
parent 9e8fcbcd8efa51d70d1207ff57bfbfe31324287a

Merge "Move delete AudioMixer closer to point of re-allocation"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 07f815e..6cd8da8 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3289,10 +3289,8 @@
                                                        keyValuePair.string());
             }
             if (status == NO_ERROR && reconfig) {
-                delete mAudioMixer;
-                // for safety in case readOutputParameters() accesses mAudioMixer (it doesn't)
-                mAudioMixer = NULL;
                 readOutputParameters();
+                delete mAudioMixer;
                 mAudioMixer = new AudioMixer(mNormalFrameCount, mSampleRate);
                 for (size_t i = 0; i < mTracks.size() ; i++) {
                     int name = getTrackName_l(mTracks[i]->mChannelMask, mTracks[i]->mSessionId);