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

Commit c5ef701a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add audio stream and usage for virtual assistant" am: 653c876b am: d271a631 

Change-Id: I3ec66f2331f1d7fe51dcf93068696089dfbce11c
parents e8764439 d271a631

audio/6.0/config/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ package audio.policy.configuration.V6_0 { 
    method public String getRawName();

    enum_constant public static final audio.policy.configuration.V6_0.Stream AUDIO_STREAM_ACCESSIBILITY;

    enum_constant public static final audio.policy.configuration.V6_0.Stream AUDIO_STREAM_ALARM;

    enum_constant public static final audio.policy.configuration.V6_0.Stream AUDIO_STREAM_ASSISTANT;

    enum_constant public static final audio.policy.configuration.V6_0.Stream AUDIO_STREAM_BLUETOOTH_SCO;

    enum_constant public static final audio.policy.configuration.V6_0.Stream AUDIO_STREAM_DTMF;

    enum_constant public static final audio.policy.configuration.V6_0.Stream AUDIO_STREAM_ENFORCED_AUDIBLE;

audio/6.0/config/audio_policy_configuration.xsd

+1 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ 
            <xs:enumeration value="AUDIO_STREAM_DTMF"/>

            <xs:enumeration value="AUDIO_STREAM_TTS"/>

            <xs:enumeration value="AUDIO_STREAM_ACCESSIBILITY"/>

            <xs:enumeration value="AUDIO_STREAM_ASSISTANT"/>

            <xs:enumeration value="AUDIO_STREAM_REROUTING"/>

            <xs:enumeration value="AUDIO_STREAM_PATCH"/>

        </xs:restriction>

audio/common/6.0/types.hal

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ enum AudioStreamType : int32_t { 
    TTS              = 9,  // Transmitted Through Speaker.  Plays over speaker

                           // only, silent on other devices

    ACCESSIBILITY    = 10, // For accessibility talk back prompts

    ASSISTANT        = 11, // For virtual assistant service

};



@export(name="audio_source_t", value_prefix="AUDIO_SOURCE_")

audio/effect/6.0/xml/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ package audio.effects.V6_0 { 
  public enum StreamOutputType {

    method public String getRawName();

    enum_constant public static final audio.effects.V6_0.StreamOutputType alarm;

    enum_constant public static final audio.effects.V6_0.StreamOutputType assistant;

    enum_constant public static final audio.effects.V6_0.StreamOutputType bluetooth_sco;

    enum_constant public static final audio.effects.V6_0.StreamOutputType dtmf;

    enum_constant public static final audio.effects.V6_0.StreamOutputType enforced_audible;

audio/effect/6.0/xml/audio_effects_conf.xsd

deleted120000 → 0
+230 −1
Original line number Diff line number Diff line 
../../2.0/xml/audio_effects_conf.xsd
 
 No newline at end of file