commit 960c4f06ae93a6102cee0c3312791c8455a8d597
author Eric Laurent <elaurent@google.com> Fri Apr 05 16:00:00 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 05 16:00:00 2019 +0000
tree 3ebe972c68a0fc71de527f332714e5627840249c
parent f83192de7927cdd0f5a7f39da5a382f41f059963
parent 337a86626e1b400a113ce5facf62fa4f6c7e7c43

Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev

media/java/android/media/audiopolicy/AudioProductStrategy.java

diff --git a/media/java/android/media/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java
index 48500e01..c1c255f 100644
--- a/media/java/android/media/audiopolicy/AudioProductStrategy.java
+++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java
@@ -262,7 +262,7 @@
                 || (attr.getContentType() == refAttr.getContentType()))
             && ((refAttr.getAllFlags() == 0)
                 || (attr.getAllFlags() != 0
-                && (attr.getAllFlags() & refAttr.getAllFlags()) == attr.getAllFlags()))
+                && (attr.getAllFlags() & refAttr.getAllFlags()) == refAttr.getAllFlags()))
             && ((refFormattedTags.length() == 0) || refFormattedTags.equals(cliFormattedTags));
     }