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

Commit 8a3fb6b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Audio: add system usage to audio policy engine schemas" into stage-aosp-udc-ts-dev

parents f7b2410f e284266e

audio/aidl/default/config/audioPolicy/engine/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -209,11 +209,13 @@ package android.audio.policy.engine.configuration { 
  public enum UsageEnumType {

    method @NonNull public String getRawName();

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_ALARM;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_ANNOUNCEMENT;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_ASSISTANCE_SONIFICATION;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_ASSISTANT;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_CALL_ASSISTANT;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_EMERGENCY;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_GAME;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_MEDIA;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_NOTIFICATION;
@@ -222,7 +224,9 @@ package android.audio.policy.engine.configuration { 
    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_NOTIFICATION_EVENT;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_SAFETY;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_UNKNOWN;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_VEHICLE_STATUS;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_VIRTUAL_SOURCE;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_VOICE_COMMUNICATION;

    enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING;

audio/aidl/default/config/audioPolicy/engine/audio_policy_engine_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -359,6 +359,10 @@ 
            <xs:enumeration value="AUDIO_USAGE_VIRTUAL_SOURCE"/>

            <xs:enumeration value="AUDIO_USAGE_ASSISTANT"/>

            <xs:enumeration value="AUDIO_USAGE_CALL_ASSISTANT"/>

            <xs:enumeration value="AUDIO_USAGE_EMERGENCY" />

            <xs:enumeration value="AUDIO_USAGE_SAFETY" />

            <xs:enumeration value="AUDIO_USAGE_VEHICLE_STATUS" />

            <xs:enumeration value="AUDIO_USAGE_ANNOUNCEMENT" />

        </xs:restriction>

    </xs:simpleType>

audio/policy/1.0/xml/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -209,11 +209,13 @@ package audio.policy.V1_0 { 
  public enum UsageEnumType {

    method public String getRawName();

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_ALARM;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_ANNOUNCEMENT;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_ASSISTANCE_SONIFICATION;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_ASSISTANT;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_CALL_ASSISTANT;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_EMERGENCY;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_GAME;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_MEDIA;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_NOTIFICATION;
@@ -222,7 +224,9 @@ package audio.policy.V1_0 { 
    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_NOTIFICATION_EVENT;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_SAFETY;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_UNKNOWN;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_VEHICLE_STATUS;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_VIRTUAL_SOURCE;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_VOICE_COMMUNICATION;

    enum_constant public static final audio.policy.V1_0.UsageEnumType AUDIO_USAGE_VOICE_COMMUNICATION_SIGNALLING;

audio/policy/1.0/xml/audio_policy_engine_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -359,6 +359,10 @@ 
            <xs:enumeration value="AUDIO_USAGE_VIRTUAL_SOURCE"/>

            <xs:enumeration value="AUDIO_USAGE_ASSISTANT"/>

            <xs:enumeration value="AUDIO_USAGE_CALL_ASSISTANT"/>

            <xs:enumeration value="AUDIO_USAGE_EMERGENCY" />

            <xs:enumeration value="AUDIO_USAGE_SAFETY" />

            <xs:enumeration value="AUDIO_USAGE_VEHICLE_STATUS" />

            <xs:enumeration value="AUDIO_USAGE_ANNOUNCEMENT" />

        </xs:restriction>

    </xs:simpleType>