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

Commit 966e0623 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AudioMix: Do not compare rules of different types"

parents 16da0e59 a7aafac2

media/java/android/media/audiopolicy/AudioMixingRule.java

+4 −0
Original line number Diff line number Diff line
@@ -409,6 +409,10 @@ public class AudioMixingRule { 
                final int match_rule = rule & ~RULE_EXCLUSION_MASK;

                while (crIterator.hasNext()) {

                    final AudioMixMatchCriterion criterion = crIterator.next();



                    if ((criterion.mRule & ~RULE_EXCLUSION_MASK) != match_rule) {

                        continue; // The two rules are not of the same type

                    }

                    switch (match_rule) {

                        case RULE_MATCH_ATTRIBUTE_USAGE:

                            // "usage"-based rule