commit cbc90453248bd3f9a11fdbc07e544d4a39592934
author Eric Laurent <elaurent@google.com> Mon Mar 19 08:34:44 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 19 08:34:44 2012 -0700
tree edc8dffb9c5f9068b0d676372fad83018ddeaadb
parent f9737a890bbaff30268c8137e6375cfa249c3f1a
parent 14958e21c12f922d7501d32c3bec05109eb342d5

am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1

* commit '14958e21c12f922d7501d32c3bec05109eb342d5':
  audioflinger: fix issue with camcorder and A2DP

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index ce701ca..05d6d72 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -794,7 +794,8 @@
             // indicate output device change to all input threads for pre processing
             AudioParameter param = AudioParameter(keyValuePairs);
             int value;
-            if (param.getInt(String8(AudioParameter::keyRouting), value) == NO_ERROR) {
+            if ((param.getInt(String8(AudioParameter::keyRouting), value) == NO_ERROR) &&
+                    (value != 0)) {
                 for (size_t i = 0; i < mRecordThreads.size(); i++) {
                     mRecordThreads.valueAt(i)->setParameters(keyValuePairs);
                 }