Merge "AudioPolicyManager: Do not allow secondary outputs with PCM offload" into main
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 2897db8..2ff2907 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1250,7 +1250,8 @@
// FIXME: in case of RENDER policy, the output capabilities should be checked
if ((secondaryMixes != nullptr && !secondaryMixes->empty())
- && !audio_is_linear_pcm(config->format)) {
+ && (!audio_is_linear_pcm(config->format) ||
+ *flags & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD)) {
ALOGD("%s: rejecting request as secondary mixes only support pcm", __func__);
return BAD_VALUE;
}
@@ -7420,7 +7421,8 @@
client->getSecondaryOutputs().begin(),
client->getSecondaryOutputs().end(),
secondaryDescs.begin(), secondaryDescs.end())) {
- if (!audio_is_linear_pcm(client->config().format)) {
+ if (client->flags() & AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD
+ || !audio_is_linear_pcm(client->config().format)) {
// If the format is not PCM, the tracks should be invalidated to get correct
// behavior when the secondary output is changed.
clientsToInvalidate.push_back(client->portId());