Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 503c3e0a authored by Kevin Rocard's avatar Kevin Rocard
Browse files

Audio policy config: remove cross-module device port name uniqueness 



This constraint was added due to an incorrect assumption
that device ports were identified by names whereas
they are by the (module,type,address) triplet.

Bug: 69442986
Test: xmllint validates an XML with two identically named devices in
      different modules.
Test: vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target -t CheckConfig.audioPolicyConfigurationValidation
Change-Id: I66d890d3c967bead4f2a287202c259009217996a
Signed-off-by: default avatarKevin Rocard <krocard@google.com>
parent fa1f5974

audio/2.0/config/audio_policy_configuration.xsd

+0 −7
Original line number Diff line number Diff line
@@ -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"/>