commit 89baccdb408b725019338870475ec24b4901fd27
author Revathi Uddaraju <revathiu@codeaurora.org> Thu Jun 11 14:21:15 2020 +0530
committer Revathi Uddaraju <revathiu@codeaurora.org> Thu Jun 11 17:05:37 2020 +0530
tree 1bbd2f596fe73fa137e0f722b6b97309379b8e34
parent de142021f7ae8ca8b452071b472c826a579e2cd0

policy-hal : align custom policy with default policy

AudioPolicyManager: Ensure direct output matches exact format
Otherwise AudioFlinger will fail on createTrack.

Change-Id: I8ad8e9a800465b9b167df205f488f1a48b27e527

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index b290aec..f8f8475 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1778,7 +1778,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++;
@@ -1815,8 +1815,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,