Merge "AudioProductStrategy: fix attributesMatches()" into rvc-dev (09116b99) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -374,8 +374,8 @@ public final class AudioProductStrategy implements Parcelable {
	if (refAttr.equals(sDefaultAttributes)) {		if (refAttr.equals(sDefaultAttributes)) {
	return false;		return false;
	}		}
	return ((refAttr.getUsage() == AudioAttributes.USAGE_UNKNOWN)		return ((refAttr.getSystemUsage() == AudioAttributes.USAGE_UNKNOWN)
	\|\| (attr.getUsage() == refAttr.getUsage()))		\|\| (attr.getSystemUsage() == refAttr.getSystemUsage()))
	&& ((refAttr.getContentType() == AudioAttributes.CONTENT_TYPE_UNKNOWN)		&& ((refAttr.getContentType() == AudioAttributes.CONTENT_TYPE_UNKNOWN)
	\|\| (attr.getContentType() == refAttr.getContentType()))		\|\| (attr.getContentType() == refAttr.getContentType()))
	&& ((refAttr.getAllFlags() == 0)		&& ((refAttr.getAllFlags() == 0)