commit c8bc22869096ee413717102d3f5d0ca804cc3174
author Jason Simmons <jsimmons@google.com> Thu Nov 08 06:12:35 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 08 06:12:35 2012 -0800
tree d62e77eec17899e7358b54dbca0bbfdca2803254
parent fd1523d782fcf402b5ee033d4134d8601d31c6c9
parent 7aab5b0f27b9567d077cc6c01807811027066619

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

* commit '7aab5b0f27b9567d077cc6c01807811027066619':
  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 906c3fc..a082239 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -1672,6 +1672,7 @@
                          ((profile->mFormats[0] == 0) &&
                              (profile->mChannelMasks.size() < 2))) {
                         ALOGW("checkOutputsForDevice() direct output missing param");
+                        mpClientInterface->closeOutput(output);
                         output = 0;
                     } else {
                         addOutput(output, desc);