Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d91287e0 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

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

am: 960c4f06

Change-Id: Iaeae8d751ac20a5d86e4774cc9c955c1a6c74c7b
parents 162ac3ad 960c4f06

media/java/android/media/audiopolicy/AudioProductStrategy.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

    }