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 4849041..19fff57 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -1675,6 +1675,7 @@
                          ((profile->mFormats[0] == 0) &&
                              (profile->mChannelMasks.size() < 2))) {
                         ALOGW("checkOutputsForDevice() direct output missing param");
+                        mpClientInterface->closeOutput(output);
                         output = 0;
                     } else {
                         addOutput(output, desc);