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

Commit ee2bb72b authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "AudioProductStrategy: fix attributesMatches()" into rvc-dev am:... 

Merge "AudioProductStrategy: fix attributesMatches()" into rvc-dev am: 09116b99 am: 539a59da am: 077ff2f3

Change-Id: I73927c4b15fe801b410572465e65ce1223cc8c9b
parents 29e36105 077ff2f3

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

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