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

Commit 960c4f06 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

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

parents f83192de 337a8662

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -262,7 +262,7 @@ public final class AudioProductStrategy implements Parcelable { 
                || (attr.getContentType() == refAttr.getContentType()))

                || (attr.getContentType() == refAttr.getContentType()))

            && ((refAttr.getAllFlags() == 0)

            && ((refAttr.getAllFlags() == 0)

                || (attr.getAllFlags() != 0

                || (attr.getAllFlags() != 0

                && (attr.getAllFlags() & refAttr.getAllFlags()) == attr.getAllFlags()))

                && (attr.getAllFlags() & refAttr.getAllFlags()) == refAttr.getAllFlags()))

            && ((refFormattedTags.length() == 0) || refFormattedTags.equals(cliFormattedTags));

            && ((refFormattedTags.length() == 0) || refFormattedTags.equals(cliFormattedTags));

    }

    }