commit 4fd526bbd72314fca35aaf0169561ac39d39c300
author Mikhail Naganov <mnaganov@google.com> Thu Sep 12 03:47:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 12 03:47:00 2019 -0700
tree f3f82f81d763d94e5da1be396015f38f22875032
parent e153774a5e1175e68bae85750aae28ff4fae74c9
parent 7c1ec2335fdcee7ddd4382577b1e2955b2715285

Merge "audiopolicy: Match DIRECT and MMAP_NOIRQ flags exactly in IOProfile" am: f28a06da98 am: a24a5f96f5
am: 7c1ec2335f

Change-Id: I934a623ed4a7a1fd51fe2a41fe45af8c41ff16e5

services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp b/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
index 6e1c0fa..f755fcd 100644
--- a/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
@@ -79,7 +79,8 @@
         }
     }
 
-    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;