diff options
| author | 2020-03-26 22:53:19 +0000 | |
|---|---|---|
| committer | 2020-03-26 22:53:19 +0000 | |
| commit | 09116b99c4813d45fca005555909a5000a6681b8 (patch) | |
| tree | 7ba03d82b0bacd22eb32148119cfc7ea935b00af | |
| parent | dd8e9d8044dc1451bdfc26766a8b911f6af761a3 (diff) | |
| parent | e9e26309fdc095a71a12b8de55cff3fbbf183b12 (diff) | |
Merge "AudioProductStrategy: fix attributesMatches()" into rvc-dev
| -rw-r--r-- | media/java/android/media/audiopolicy/AudioProductStrategy.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java index f9dbc50e20cf..090f78e4e4f7 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategy.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java @@ -374,8 +374,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) |