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

Commit 351785dc authored by Ján Sebechlebský's avatar Ján Sebechlebský Committed by Android (Google) Code Review
Browse files

Merge "Throw exception when attempting to build empty AudioMixingRule."

parents b0d0974a c16bba7a

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

+4 −0
Original line number Diff line number Diff line
@@ -704,8 +704,12 @@ public class AudioMixingRule { 
         * Combines all of the matching and exclusion rules that have been set and return a new

         * {@link AudioMixingRule} object.

         * @return a new {@link AudioMixingRule} object

         * @throws IllegalArgumentException if the rule is empty.

         */

        public AudioMixingRule build() {

            if (mCriteria.isEmpty()) {

                throw new IllegalArgumentException("Cannot build AudioMixingRule with no rules.");

            }

            return new AudioMixingRule(

                    mTargetMixType == AudioMix.MIX_TYPE_INVALID

                            ? AudioMix.MIX_TYPE_PLAYERS : mTargetMixType,

media/tests/AudioPolicyTest/src/com/android/audiopolicytest/AudioMixingRuleUnitTests.java

+6 −0
Original line number Diff line number Diff line
@@ -212,6 +212,12 @@ public class AudioMixingRuleUnitTests { 
                containsInAnyOrder(isAudioMixSessionCriterion(TEST_SESSION_ID)));

    }



    @Test

    public void audioMixingRuleWithNoRulesFails() {

        assertThrows(IllegalArgumentException.class,

                () -> new AudioMixingRule.Builder().build());

    }





    private static Matcher isAudioMixUidCriterion(int uid, boolean exclude) {

        return new CustomTypeSafeMatcher<AudioMixMatchCriterion>("uid mix criterion") {