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

Commit e9e26309 authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioProductStrategy: fix attributesMatches() 

Use AudioAttributes.getSystemUsage() instead of getUsage()
when comparing attributes as getUsage() defaults to UNKNOWN for
system usages and causes a false match.

Bug: 136121584
Test: build & run cts-dev -m CtsMediaTestCase --test android.media.cts.AudioProductStrategyTest
Change-Id: I377e840b18443c33fb0b562b27fbc706aaeb8055
parent 051829b8

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)