diff options
author | Jason Simmons <jsimmons@google.com> | 2012-11-08 06:18:52 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 06:18:52 -0800 |
commit | 02580d804ab9d51e80298f97e0dcd7a752eaf5da (patch) | |
tree | 29dc57ecdcebdddde8fe43515faefbb80f5242ef /audio | |
parent | 82c9851ac6dd9ba07a4c341461602ebf2edef33d (diff) | |
parent | c8bc22869096ee413717102d3f5d0ca804cc3174 (diff) | |
download | hardware_libhardware_legacy-02580d804ab9d51e80298f97e0dcd7a752eaf5da.zip hardware_libhardware_legacy-02580d804ab9d51e80298f97e0dcd7a752eaf5da.tar.gz hardware_libhardware_legacy-02580d804ab9d51e80298f97e0dcd7a752eaf5da.tar.bz2 |
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
Diffstat (limited to 'audio')
-rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ status_t AudioPolicyManagerBase::checkOutputsForDevice(audio_devices_t device, ((profile->mFormats[0] == 0) && (profile->mChannelMasks.size() < 2))) { ALOGW("checkOutputsForDevice() direct output missing param"); + mpClientInterface->closeOutput(output); output = 0; } else { addOutput(output, desc); |