commit 9e8fcbcd8efa51d70d1207ff57bfbfe31324287a
author Glenn Kasten <gkasten@google.com> Thu Jul 25 10:09:11 2013 -0700
committer Glenn Kasten <gkasten@google.com> Thu Jul 25 12:50:26 2013 -0700
tree 43dae12b292fcfe0ab9ed12c57f26a170b16b807
parent fc5ea08326b510c6f82f71845d95a8758a6ab698

Move delete AudioMixer closer to point of re-allocation

No need to delete AudioMixer before readOutputParameters

Change-Id: Icafa785c9021bbe8d985e4f9527f8fc8c5e62622

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index f27d908..6451cce 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3035,10 +3035,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);