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

AudioService: fix AudioProductStrategy matching rule

Browse Source 
Strategies use rules on attributes, and use public getter
to compare usages. However, some usage are system only and
now filtered by public getter.
This CL fixes this issue by adding a hidden get for usage
that return whatever public or system usage.

Test: adb shell am instrument -w -e class com.android.audiopolicytest.AudioManagerTest#testAudioAttributesToStreamTypes com.android.audiopolicytest

Signed-off-by: Francois Gaffie <francois.gaffie@renault.com>
Change-Id: Iddd55af8f230cb063dcaa9ba950b890cbbb81643
Merged-In: I377e840b18443c33fb0b562b27fbc706aaeb8055
This commit is contained in:
Francois Gaffie
2020-03-25 13:24:14 +01:00
committed by Eric Laurent
parent 2f46cd181a
commit 05672e534e
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)