summaryrefslogtreecommitdiff
path: root/audio/common/all-versions/default/7.0/HidlUtils.cpp
diff options
context:
space:
mode:
authorMikhail Naganov <mnaganov@google.com>2022-02-11 21:51:00 +0000
committerMikhail Naganov <mnaganov@google.com>2022-02-12 00:03:49 +0000
commita85cebb63e35005952c8245c832b7aaa8824d0bd (patch)
treeaea2259870a57747b8f726a822aa965a71e6a6eb /audio/common/all-versions/default/7.0/HidlUtils.cpp
parentec8ef38ad96760062300f993fa2ebb90a5fc15ea (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
Diffstat (limited to 'audio/common/all-versions/default/7.0/HidlUtils.cpp')
-rw-r--r--audio/common/all-versions/default/7.0/HidlUtils.cpp4
1 files changed, 4 insertions, 0 deletions
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);