commit 2fbecbad88f0c6298c35a5bc1bf87aa244059754
author Eric Laurent <elaurent@google.com> Thu Nov 08 15:48:00 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 08 15:48:00 2012 -0800
tree e990910bab7f33771dee37548260e68c072f8611
parent 8254f4b244a1f5d65054831d2b0afe53c67c3898
parent 8d8ad2ec94dfab5555dbac71c8d5fe8d1cde0cea

am 8d8ad2ec: am fe43d163: audio policy: fix volume problem - DO NOT MERGE

* commit '8d8ad2ec94dfab5555dbac71c8d5fe8d1cde0cea':
  audio policy: fix volume problem - DO NOT MERGE

audio/AudioPolicyManagerBase.cpp

diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index a082239..19fff57 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -169,9 +169,12 @@
 
         updateDevicesAndOutputs();
         for (size_t i = 0; i < mOutputs.size(); i++) {
+            // do not force device change on duplicated output because if device is 0, it will
+            // also force a device 0 for the two outputs it is duplicated to which may override
+            // a valid device selection on those outputs.
             setOutputDevice(mOutputs.keyAt(i),
                             getNewDevice(mOutputs.keyAt(i), true /*fromCache*/),
-                            true,
+                            !mOutputs.valueAt(i)->isDuplicated(),
                             0);
         }