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

Commit 6ae5c189 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Make AUDIO_USAGE_NOTIFICATION_EVENT available to HALs am: a85cebb6 am: 783f8f14 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1983828

Change-Id: Ia38cbd174b23617b1cc0877c3e72bc7ae55930e0
parents 02adb713 783f8f14

audio/7.1/config/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

audio/7.1/config/audio_policy_configuration.xsd

+1 −0
Original line number Diff line number Diff line
@@ -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" />

audio/common/all-versions/default/7.0/HidlUtils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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);