Merge "audiopolicy: Match DIRECT and MMAP_NOIRQ flags exactly in IOProfile"

5 years ago · f28a06da98
parent bac928872a 1f8da41281
commit f28a06da98
1 changed files with 2 additions and 1 deletions
--- a/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
@ -79,7 +79,8 @@ bool IOProfile::isCompatibleProfile(const DeviceVector &devices,
        }
    }

-    const uint32_t mustMatchOutputFlags = AUDIO_OUTPUT_FLAG_HW_AV_SYNC;
+    const uint32_t mustMatchOutputFlags =
+            AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_HW_AV_SYNC|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ;
    if (isPlaybackThread && (((getFlags() ^ flags) & mustMatchOutputFlags)
                    || (getFlags() & flags) != flags)) {
        return false;