commit 3dee034c458bd579b1cc619f849b3523e881da6e
author Irfan Sheriff <isheriff@google.com> Thu Nov 08 06:18:53 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 08 06:18:53 2012 -0800
tree e990910bab7f33771dee37548260e68c072f8611
parent 02580d804ab9d51e80298f97e0dcd7a752eaf5da
parent b1e73538da3e719f404ca014c48fd8dddf81c141

am b1e73538: am 7fcf81e3: am 745e7fd4: Fix stop supplicant api

* commit 'b1e73538da3e719f404ca014c48fd8dddf81c141':
  Fix stop supplicant api

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);
         }