From 337a86626e1b400a113ce5facf62fa4f6c7e7c43 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Wed, 3 Apr 2019 16:41:39 -0700 Subject: [PATCH] fix AudioAttributes matching rule in AudioProductStrategy The matching rule on audio attributes flags must be that ALL flags set in the reference attributes are present in the compared attributes and not just some flags. Bug: 129721367 Test: change volume in Play Music Change-Id: I462fd73fb9b78b094411c6f3b52004349f49bcf3 (cherry picked from commit 9b0bb840cd082822487e6cfe8c4470ce928d7531) --- media/java/android/media/audiopolicy/AudioProductStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/java/android/media/audiopolicy/AudioProductStrategy.java b/media/java/android/media/audiopolicy/AudioProductStrategy.java index 48500e01e86ab..c1c255f68996a 100644 --- a/media/java/android/media/audiopolicy/AudioProductStrategy.java +++ b/media/java/android/media/audiopolicy/AudioProductStrategy.java @@ -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)); }