commit 1794d71f7a3777595503b5c6c667c3e0d83baad6
author chenhg <chenhg@synaptics.com> Tue Oct 09 15:20:37 2018 -0700
committer chenhg <chenhg@synaptics.com> Tue Nov 20 16:56:21 2018 -0800
tree 330b5f020b020c586fea46daa61d0f3588dbffd2
parent 4462ff08c41880644903702e4734cda7a320aadd

Ignore outputs with direct flag when selectOutput.

BUG: 117479947
Test: android.media.cts.AudioNativeTest#testPlayStreamData

Change-Id: I0eec86185b5582f82267a24f3568244bf1c8378f

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 2924473..b5d9963 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1081,13 +1081,12 @@
     for (audio_io_handle_t output : outputs) {
         sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueFor(output);
         if (!outputDesc->isDuplicated()) {
+            if (outputDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
+                continue;
+            }
             // if a valid format is specified, skip output if not compatible
             if (format != AUDIO_FORMAT_INVALID) {
-                if (outputDesc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) {
-                    if (format != outputDesc->mFormat) {
-                        continue;
-                    }
-                } else if (!audio_is_linear_pcm(format)) {
+                if (!audio_is_linear_pcm(format)) {
                     continue;
                 }
                 if (AudioPort::isBetterFormatMatch(