commit 14fa6ee5b1ef7214847b8d443f3e01f116e42099
author Mikhail Naganov <mnaganov@google.com> Thu Feb 04 15:57:30 2021 -0800
committer Mikhail Naganov <mnaganov@google.com> Thu Feb 04 16:04:56 2021 -0800
tree c08120fb6480ab6ad1e68fc78b6986ad2e854c2a
parent 8844e5b92d4ee147eb07bf5fd528f2d14fda2c3a

audio: Allow using vendor extensions in surround formats (V6)

The 'surroundFormats' section must allow specifying
vendor-provided formats (vendor extensions). This has been
fixed in Audio HAL V7. Backporting to earlier versions.

Bug: 173647783
Test: atest VtsHalAudioV6_0TargetTest
Change-Id: I8ae1687087bab3f1c9020f351bdf7b81b9e74e50

audio/6.0/config/audio_policy_configuration.xsd

diff --git a/audio/6.0/config/audio_policy_configuration.xsd b/audio/6.0/config/audio_policy_configuration.xsd
index ead1cc2..c2b8c5d 100644
--- a/audio/6.0/config/audio_policy_configuration.xsd
+++ b/audio/6.0/config/audio_policy_configuration.xsd
@@ -614,13 +614,13 @@
         </xs:sequence>
     </xs:complexType>
     <xs:simpleType name="audioFormatsList">
-        <xs:list itemType="audioFormat" />
+        <xs:list itemType="extendableAudioFormat" />
     </xs:simpleType>
     <xs:complexType name="surroundFormats">
         <xs:sequence>
             <xs:element name="format" minOccurs="0" maxOccurs="unbounded">
                 <xs:complexType>
-                    <xs:attribute name="name" type="audioFormat" use="required"/>
+                    <xs:attribute name="name" type="extendableAudioFormat" use="required"/>
                     <xs:attribute name="subformats" type="audioFormatsList" />
                 </xs:complexType>
             </xs:element>