summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy/managerdefault
diff options
context:
space:
mode:
Diffstat (limited to 'services/audiopolicy/managerdefault')
-rw-r--r--services/audiopolicy/managerdefault/AudioPolicyManager.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index a0de34d..ee25b71 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -3140,8 +3140,11 @@ status_t AudioPolicyManager::checkOutputsForDevice(const sp<DeviceDescriptor> de
{
audio_devices_t device = devDesc->type();
sp<SwAudioOutputDescriptor> desc;
- // erase all current sample rates, formats and channel masks
- devDesc->clearCapabilities();
+
+ if (audio_device_is_digital(device)) {
+ // erase all current sample rates, formats and channel masks
+ devDesc->clearCapabilities();
+ }
if (state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE) {
// first list already open outputs that can be routed to this device
@@ -3433,8 +3436,13 @@ status_t AudioPolicyManager::checkInputsForDevice(const sp<DeviceDescriptor> dev
const String8 address)
{
audio_devices_t device = devDesc->type();
-
sp<AudioInputDescriptor> desc;
+
+ if (audio_device_is_digital(device)) {
+ // erase all current sample rates, formats and channel masks
+ devDesc->clearCapabilities();
+ }
+
if (state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE) {
// first list already open inputs that can be routed to this device
for (size_t input_index = 0; input_index < mInputs.size(); input_index++) {