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

Commit c588601a authored by Carter Hsu's avatar Carter Hsu Committed by Android (Google) Code Review
Browse files

Merge "audio: add Ultrasound materials to 7.1"

parents 1313a757 bb2fe3f4

audio/7.1/config/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_MUSIC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SONIFICATION;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SPEECH;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_UNKNOWN;

  }
@@ -273,6 +274,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_MMAP_NOIRQ;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_RAW;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_SYNC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_VOIP_TX;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
@@ -290,6 +292,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SPATIALIZER;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SYNC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_TTS;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_VOIP_RX;

  }
@@ -314,6 +317,7 @@ package android.audio.policy.configuration.V7_1 { 
    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_HOTWORD;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_MIC;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_REMOTE_SUBMIX;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_ULTRASOUND;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_UNPROCESSED;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_CALL;

    enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_COMMUNICATION;

audio/7.1/config/audio_policy_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 
            <xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_SPATIALIZER" />

            <xs:enumeration value="AUDIO_OUTPUT_FLAG_ULTRASOUND" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />
@@ -188,6 +189,7 @@ 
            <xs:enumeration value="AUDIO_INPUT_FLAG_VOIP_TX" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_HW_AV_SYNC" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_DIRECT" />

            <xs:enumeration value="AUDIO_INPUT_FLAG_ULTRASOUND" />

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="audioInOutFlags">
@@ -471,6 +473,7 @@ 
            <xs:enumeration value="AUDIO_CONTENT_TYPE_MUSIC"/>

            <xs:enumeration value="AUDIO_CONTENT_TYPE_MOVIE"/>

            <xs:enumeration value="AUDIO_CONTENT_TYPE_SONIFICATION"/>

            <xs:enumeration value="AUDIO_CONTENT_TYPE_ULTRASOUND"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="samplingRates">
@@ -742,6 +745,7 @@ 
            <xs:enumeration value="AUDIO_SOURCE_ECHO_REFERENCE"/>

            <xs:enumeration value="AUDIO_SOURCE_FM_TUNER"/>

            <xs:enumeration value="AUDIO_SOURCE_HOTWORD"/>

            <xs:enumeration value="AUDIO_SOURCE_ULTRASOUND"/>

        </xs:restriction>

    </xs:simpleType>

    <!-- Enum values of device_category from Volume.h. -->