commit f837f71cfa044f4579a314929fd9b32f6c5732b6
author Joshua Duong <joshuaduong@google.com> Thu Oct 10 13:27:07 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 10 13:27:07 2019 -0700
tree 356bccbc01fb3bf3f68a24e84b8660958388a603
parent 0b0b62e6ce067e5f9311b34323a8c8ed7da03bdd
parent 6800e0a8464a5f748200b63c2817c321b9852356

Merge "Revert "Audio HAL: Add missing device to XSD"" into pie-vts-dev am: 75cfcfd3e2 am: 08880e6745 am: 803b7d9f18
am: 6800e0a846

Change-Id: Idc5ae3680349cb0c2a96fd81cc8c7bb104387eca

audio/4.0/config/audio_policy_configuration.xsd

diff --git a/audio/4.0/config/audio_policy_configuration.xsd b/audio/4.0/config/audio_policy_configuration.xsd
index f26e41b..58bab22 100644
--- a/audio/4.0/config/audio_policy_configuration.xsd
+++ b/audio/4.0/config/audio_policy_configuration.xsd
@@ -357,10 +357,6 @@
             <xs:enumeration value="AUDIO_FORMAT_APTX_HD"/>
             <xs:enumeration value="AUDIO_FORMAT_AC4"/>
             <xs:enumeration value="AUDIO_FORMAT_LDAC"/>
-            <xs:enumeration value="AUDIO_FORMAT_E_AC3_JOC"/>
-            <xs:enumeration value="AUDIO_FORMAT_MAT_1_0"/>
-            <xs:enumeration value="AUDIO_FORMAT_MAT_2_0"/>
-            <xs:enumeration value="AUDIO_FORMAT_MAT_2_1"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="extendableAudioFormat">