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

Merge "AudioService: fix AudioProductStrategy matching rule"

Browse Source
This commit is contained in:
Eric Laurent
2020-04-13 21:32:59 +00:00
committed by Gerrit Code Review
parent 6ed4be3ab4 05672e534e
commit c48b0c9e96
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/AudioAttributes.java
View File

@@ -505,6 +505,16 @@ public final class AudioAttributes implements Parcelable {
return (mFlags & FLAG_ALL);
}
/**
* @hide
* Return usage, even the non-public ones.
* Internal use only
* @return one of the values that can be set in {@link Builder#setUsage(int)}
*/
public int getSystemUsage() {
return mUsage;
}
/**
* @hide
* Return the Bundle of data.

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

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