commit 795c07e07c726ff7fb4a67c4e9c1cd75e5c54125
author qctecmdr <qctecmdr@localhost> Wed Jun 24 19:54:26 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 24 19:54:26 2020 -0700
tree 49b9c29909dfc2cd626c5515bb6fb20b54fc71bf
parent 9d7ccc413c4a6854331971c654d73210cba61d2a
parent 89baccdb408b725019338870475ec24b4901fd27

Merge "policy-hal : align custom policy with default policy"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index bce91d5..be678bc 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1783,7 +1783,7 @@
                     // reuse direct output if currently open by the same client
                     // and configured with same parameters
                     if ((config->sample_rate == desc->getSamplingRate()) &&
-                        audio_formats_match(config->format, desc->getFormat()) &&
+                        (config->format == desc->getFormat()) &&
                         (channelMask == desc->getChannelMask()) &&
                         (session == desc->mDirectClientSession)) {
                         desc->mDirectOpenCount++;
@@ -1820,8 +1820,7 @@
         // only accept an output with the requested parameters
         if (status != NO_ERROR ||
             (config->sample_rate != 0 && config->sample_rate != outputDesc->getSamplingRate()) ||
-            (config->format != AUDIO_FORMAT_DEFAULT &&
-                     !audio_formats_match(config->format, outputDesc->getFormat())) ||
+            (config->format != AUDIO_FORMAT_DEFAULT && config->format != outputDesc->getFormat()) ||
             (channelMask != 0 && channelMask != outputDesc->getChannelMask())) {
             ALOGV("getOutputForDevice() failed opening direct output: output %d sample rate %d %d,"
                     "format %d %d, channel mask %04x %04x", output, config->sample_rate,