commit 02580d804ab9d51e80298f97e0dcd7a752eaf5da
author Jason Simmons <jsimmons@google.com> Thu Nov 08 06:18:52 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 08 06:18:52 2012 -0800
tree 29dc57ecdcebdddde8fe43515faefbb80f5242ef
parent 82c9851ac6dd9ba07a4c341461602ebf2edef33d
parent c8bc22869096ee413717102d3f5d0ca804cc3174

am c8bc2286: am 7aab5b0f: Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev

* commit 'c8bc22869096ee413717102d3f5d0ca804cc3174':
  Close a newly opened direct output if its parameters are invalid

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