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

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

Browse Source 
am: 960c4f06ae

Change-Id: Iaeae8d751ac20a5d86e4774cc9c955c1a6c74c7b
This commit is contained in:
Eric Laurent
2019-04-05 10:38:47 -07:00
committed by android-build-merger
parent 162ac3ad85 960c4f06ae
commit d91287e09a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,7 @@ public final class AudioProductStrategy implements Parcelable {
|| (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));
}