commit e4fb4e20e7412bb999477a9a70da13b424bda73b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 24 18:54:01 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 24 18:54:01 2018 +0000
tree 3e7c8fd55fb49e681e9d8c9bd52f7286e9b1f0f8
parent 079fdeb1d119f6a05ae9063244df831dea06c656
parent 6729c05751ac1d5ead8b8484daf1e58f19c3d41f

Merge "bug fix: close file pointer" 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 0a52b55..7647cad 100644
--- a/audio/2.0/config/audio_policy_configuration.xsd
+++ b/audio/2.0/config/audio_policy_configuration.xsd
@@ -49,10 +49,6 @@
             <xs:selector xpath="modules/module"/>
             <xs:field xpath="@name"/>
         </xs:key>
-        <xs:key name="devicePortNameGlobalKey">
-            <xs:selector xpath="modules/module/devicePorts/devicePort"/>
-            <xs:field xpath="@tagName"/>
-        </xs:key>
         <xs:unique name="volumeTargetUniqueness">
             <xs:selector xpath="volumes/volume"/>
             <xs:field xpath="@stream"/>
@@ -141,9 +137,6 @@
                     <xs:selector xpath="mixPorts/mixPort"/>
                     <xs:field xpath="@name"/>
                 </xs:unique>
-                <!-- Although this key constraint is redundant with devicePortNameGlobalKey,
-                     the set is used to constraint defaultOutputDevice and attachedDevice
-                     to reference a devicePort of the same module. -->
                 <xs:key name="devicePortNameKey">
                     <xs:selector xpath="devicePorts/devicePort"/>
                     <xs:field xpath="@tagName"/>