| commit | ddf8c69f4aa680e7f3569f7c49b147762063773d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 16 22:39:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 16 22:39:09 2022 +0000 |
| tree | 845f616492435ce87d9066d45692b134d254970e | |
| parent | f77415e60a5a3c8cf2d3ef91f7cd3812e65be1f7 [diff] | |
| parent | 32d6ff68546ecad0e51e974b4ae78179e4cbbcd0 [diff] |
Merge "Add AUDIO_ENCAPSULATION_TYPE_PCM." am: f49af6b686 am: 32d6ff6854 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2362642 Change-Id: I4df14b164b43ac7748786a1253d1f87ec8051fd1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/config/audioPolicy/api/current.txt b/audio/aidl/default/config/audioPolicy/api/current.txt index 5a8b970..ad79a0c 100644 --- a/audio/aidl/default/config/audioPolicy/api/current.txt +++ b/audio/aidl/default/config/audioPolicy/api/current.txt
@@ -167,6 +167,7 @@ method @NonNull public String getRawName(); enum_constant public static final android.audio.policy.configuration.AudioEncapsulationType AUDIO_ENCAPSULATION_TYPE_IEC61937; enum_constant public static final android.audio.policy.configuration.AudioEncapsulationType AUDIO_ENCAPSULATION_TYPE_NONE; + enum_constant public static final android.audio.policy.configuration.AudioEncapsulationType AUDIO_ENCAPSULATION_TYPE_PCM; } public enum AudioFormat {
diff --git a/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd b/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd index ddaa122..301c969 100644 --- a/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd +++ b/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd
@@ -576,6 +576,7 @@ <xs:restriction base="xs:string"> <xs:enumeration value="AUDIO_ENCAPSULATION_TYPE_NONE"/> <xs:enumeration value="AUDIO_ENCAPSULATION_TYPE_IEC61937"/> + <xs:enumeration value="AUDIO_ENCAPSULATION_TYPE_PCM"/> </xs:restriction> </xs:simpleType> <xs:complexType name="profile">