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

This commit is contained in:
Eric Laurent
2019-04-05 16:00:00 +00:00
committed by Android (Google) Code Review

View File

@@ -262,7 +262,7 @@ public final class AudioProductStrategy implements Parcelable {
|| (attr.getContentType() == refAttr.getContentType())) || (attr.getContentType() == refAttr.getContentType()))
&& ((refAttr.getAllFlags() == 0) && ((refAttr.getAllFlags() == 0)
|| (attr.getAllFlags() != 0 || (attr.getAllFlags() != 0
&& (attr.getAllFlags() & refAttr.getAllFlags()) == attr.getAllFlags())) && (attr.getAllFlags() & refAttr.getAllFlags()) == refAttr.getAllFlags()))
&& ((refFormattedTags.length() == 0) || refFormattedTags.equals(cliFormattedTags)); && ((refFormattedTags.length() == 0) || refFormattedTags.equals(cliFormattedTags));
} }