diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2022-02-11 21:51:00 +0000 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2022-02-12 00:03:49 +0000 |
| commit | a85cebb63e35005952c8245c832b7aaa8824d0bd (patch) | |
| tree | aea2259870a57747b8f726a822aa965a71e6a6eb | |
| parent | ec8ef38ad96760062300f993fa2ebb90a5fc15ea (diff) | |
Make AUDIO_USAGE_NOTIFICATION_EVENT available to HALs
This aligns the list of usages between the framework
and HALs
Bug: 199193042
Test: atest android.hardware.audio@7.1-util_tests
Test: atest android.hardware.audio.common@7.1-util_tests
Test: atest VtsHalAudioV7_1TargetTest
Change-Id: I4d7fdbacff87eebcbc8d68dd6ed8cefdd52aa84e
| -rw-r--r-- | audio/7.1/config/api/current.txt | 1 | ||||
| -rw-r--r-- | audio/7.1/config/audio_policy_configuration.xsd | 1 | ||||
| -rw-r--r-- | audio/common/all-versions/default/7.0/HidlUtils.cpp | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/audio/7.1/config/api/current.txt b/audio/7.1/config/api/current.txt index 3a08b71d86..75fc5c0447 100644 --- a/audio/7.1/config/api/current.txt +++ b/audio/7.1/config/api/current.txt @@ -359,6 +359,7 @@ package android.audio.policy.configuration.V7_1 { enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_GAME; enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_MEDIA; enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION; + enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION_EVENT; enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE; enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_SAFETY; enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_UNKNOWN; diff --git a/audio/7.1/config/audio_policy_configuration.xsd b/audio/7.1/config/audio_policy_configuration.xsd index ebc23edff2..7e1da90519 100644 --- a/audio/7.1/config/audio_policy_configuration.xsd +++ b/audio/7.1/config/audio_policy_configuration.xsd @@ -443,6 +443,7 @@ <xs:enumeration value="AUDIO_USAGE_ALARM" /> <xs:enumeration value="AUDIO_USAGE_NOTIFICATION" /> <xs:enumeration value="AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE" /> + <xs:enumeration value="AUDIO_USAGE_NOTIFICATION_EVENT" /> <xs:enumeration value="AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY" /> <xs:enumeration value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE" /> <xs:enumeration value="AUDIO_USAGE_ASSISTANCE_SONIFICATION" /> diff --git a/audio/common/all-versions/default/7.0/HidlUtils.cpp b/audio/common/all-versions/default/7.0/HidlUtils.cpp index 218d7c06b7..0fd2947963 100644 --- a/audio/common/all-versions/default/7.0/HidlUtils.cpp +++ b/audio/common/all-versions/default/7.0/HidlUtils.cpp @@ -485,8 +485,12 @@ status_t HidlUtils::audioGainToHal(const AudioGain& gain, struct audio_gain* hal status_t HidlUtils::audioUsageFromHal(audio_usage_t halUsage, AudioUsage* usage) { if (halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST || halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT || +#if MAJOR_VERSION == 7 && MINOR_VERSION == 1 + halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED) { +#else halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED || halUsage == AUDIO_USAGE_NOTIFICATION_EVENT) { +#endif halUsage = AUDIO_USAGE_NOTIFICATION; } *usage = audio_usage_to_string(halUsage); |