Merge "Require HW AV sync flag match for compatible output IOProfile"

am: bac928872a Change-Id: I38ee94ca51369d66e18ca01acc9c12311a7e576f
5 years ago · ee14f82361
parent 19f6a6ce5d bac928872a
commit ee14f82361
1 changed files with 3 additions and 1 deletions
--- a/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/IOProfile.cpp
@ -79,7 +79,9 @@ bool IOProfile::isCompatibleProfile(const DeviceVector &devices,
        }
    }

-    if (isPlaybackThread && (getFlags() & flags) != flags) {
+    const uint32_t mustMatchOutputFlags = AUDIO_OUTPUT_FLAG_HW_AV_SYNC;
+    if (isPlaybackThread && (((getFlags() ^ flags) & mustMatchOutputFlags)
+                    || (getFlags() & flags) != flags)) {
        return false;
    }
    // The only input flag that is allowed to be different is the fast flag.