summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaresh Tanniru <ntanniru@codeaurora.org>2016-09-14 11:25:37 +0530
committerArne Coucheron <arco68@gmail.com>2016-10-16 07:49:23 +0200
commitd40c37078cbec0d43c8888317f6f7495f66904c5 (patch)
treef590fca0e000b3d8022e3c76aa0c84f1ca1f7bcc
parent081aed68650a6e48b55a7724c4cc7e35dcda6979 (diff)
downloadhardware_qcom_audio-cm-14.0-caf-8960.tar.gz
hardware_qcom_audio-cm-14.0-caf-8960.tar.bz2
hardware_qcom_audio-cm-14.0-caf-8960.zip
audiopolicy: Avoid spurious routing in APM::stopSourcecm-14.0-caf-8960
- On AudioOutput::stopSource, ignore routing calls on an output descriptor to the same device Change-Id: I10026d3d9147e45d3ed2b93160922bc3bb4bc2d0
-rw-r--r--policy_hal/AudioPolicyManager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 90cd638e..d6ba2fd4 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -780,6 +780,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe
outputDesc->sharesHwModuleWith(desc) &&
(newDevice != desc->device())) {
audio_devices_t dev = getNewOutputDevice(mOutputs.valueFor(curOutput), false /*fromCache*/);
+ bool force = desc->device() != dev;
uint32_t delayMs;
if (dev == prevDevice) {
delayMs = 0;
@@ -788,7 +789,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe
}
setOutputDevice(desc,
dev,
- true,
+ force,
delayMs);
}
}