commit 96b6fcdc4f3695e63f1a7a6a847396f4a09f4c1b
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 23 22:42:11 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 23 22:42:11 2018 +0000
tree 7b201ace6d1763545c94ce42971d507c75db2668
parent 117188b3158be8a110eb77db63e85a57711c10de
parent 1e7e982a72ac8172a01bc0ec361b0137da23a7b0

Merge "Audio VTS: HAL can support more than the native sampling rates" into oreo-vts-dev

audio/2.0/config/audio_policy_configuration.xsd

diff --git a/audio/2.0/config/audio_policy_configuration.xsd b/audio/2.0/config/audio_policy_configuration.xsd
index 8c05763..0a52b55 100644
--- a/audio/2.0/config/audio_policy_configuration.xsd
+++ b/audio/2.0/config/audio_policy_configuration.xsd
@@ -148,6 +148,11 @@
                     <xs:selector xpath="devicePorts/devicePort"/>
                     <xs:field xpath="@tagName"/>
                 </xs:key>
+                <xs:unique name="devicePortUniqueness">
+                    <xs:selector xpath="devicePorts/devicePort"/>
+                    <xs:field xpath="@type"/>
+                    <xs:field xpath="@address"/>
+                </xs:unique>
                 <xs:keyref name="defaultOutputDeviceRef" refer="devicePortNameKey">
                     <xs:selector xpath="defaultOutputDevice"/>
                     <xs:field xpath="."/>
@@ -419,7 +424,7 @@
                     <xs:attribute name="tagName" type="xs:token" use="required"/>
                     <xs:attribute name="type" type="audioDevice" use="required"/>
                     <xs:attribute name="role" type="role" use="required"/>
-                    <xs:attribute name="address" type="xs:string" use="optional"/>
+                    <xs:attribute name="address" type="xs:string" use="optional" default=""/>
                 </xs:complexType>
                 <xs:unique name="devicePortProfileUniqueness">
                     <xs:selector xpath="profile"/>