| commit | 193f7ca8f893937ddd2cec91a5797b36dfc6575f | [log] [tgz] |
|---|---|---|
| author | Jan Sebechlebsky <jsebechlebsky@google.com> | Thu Aug 18 14:40:37 2022 +0200 |
| committer | Jan Sebechlebsky <jsebechlebsky@google.com> | Wed Oct 05 09:47:35 2022 +0200 |
| tree | d090b79c3aa8375a8b182ee2f6794c7c58e879c9 | |
| parent | d6c9601435e157e26ea9f09e32b6efa03dfa8efa [diff] |
Validate consistency of audio mix criteria during registration Bug: 244582702 Test: atest audiosystem_tests audiopolicy_tests Test: atest AudioServiceHostTest AudioHostTest AudioPolicyHostTest Change-Id: I823be4f424c942834316106b5f93af5f77005cdc Merged-In: I823be4f424c942834316106b5f93af5f77005cdc
diff --git a/media/libaudioclient/AudioPolicy.cpp b/media/libaudioclient/AudioPolicy.cpp index 3dbaffd..4d2b6b1 100644 --- a/media/libaudioclient/AudioPolicy.cpp +++ b/media/libaudioclient/AudioPolicy.cpp
@@ -71,6 +71,10 @@ return NO_ERROR; } +bool AudioMixMatchCriterion::isExcludeCriterion() const { + return mRule & RULE_EXCLUSION_MASK; +} + // // AudioMix implementation //
diff --git a/media/libaudioclient/include/media/AudioPolicy.h b/media/libaudioclient/include/media/AudioPolicy.h index 25aedad..d42d962 100644 --- a/media/libaudioclient/include/media/AudioPolicy.h +++ b/media/libaudioclient/include/media/AudioPolicy.h
@@ -72,6 +72,7 @@ status_t readFromParcel(Parcel *parcel); status_t writeToParcel(Parcel *parcel) const; + bool isExcludeCriterion() const; union { audio_usage_t mUsage; audio_source_t mSource;