Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "AudioProductStrategy: fix attributesMatches()" into rvc-dev am: 09116b99c4 am: 539a59da7f am: 749d6513fc

Browse Source 
Change-Id: If97c3b6be018e30918094f9d3fd8b09c2a1c319d
This commit is contained in:
Eric Laurent
2020-03-26 23:31:01 +00:00
committed by Automerger Merge Worker
parent f38b0c6d0b 749d6513fc
commit 64f18776aa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/audiopolicy/AudioProductStrategy.java
View File

@@ -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)