Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ján Sebechlebský
2022-10-18 18:58:09 +00:00
committed by Android (Google) Code Review
parent b0d0974aeb c16bba7a83
commit 351785dcfa
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/audiopolicy/AudioMixingRule.java
View File

@@ -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,

6
media/tests/AudioPolicyTest/src/com/android/audiopolicytest/AudioMixingRuleUnitTests.java
View File

@@ -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") {