commit f7adb3f07332a6b7af8272a04757f282ad311b58
author Eric Laurent <elaurent@google.com> Wed Nov 21 08:35:40 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 21 08:35:40 2018 -0800
tree 5458ac5666292f4b6e34c754cc1b7f9cc33a1de8
parent d4d7f1ffcab75a365939ee43d5cb83fc3e0acad4
parent 5928ec9661758549cbda50710a152050136d5ddc

Merge "Ignore outputs with direct flag when selectOutput." am: a1270b044b am: f3bcc30de3
am: 5928ec9661

Change-Id: Id97fcda0eb511f0711cd0adc93763d46c940cf4c

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 58acad3..d118459 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1257,13 +1257,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(