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

Commit ead5a3be authored by Kevin Rocard's avatar Kevin Rocard Committed by android-build-merger
Browse files

Audio policy config: Device port (type,address) must be unique am: fa1f5974 am: d4112727 

am: 7c7fc0c6

Change-Id: I669ff1e8e32b7e539d33d8f1a05ee06962836e60
parents c8ef2e0e 7c7fc0c6

audio/2.0/config/audio_policy_configuration.xsd

+6 −1
Original line number Original line Diff line number Diff line
@@ -148,6 +148,11 @@ 
                    <xs:selector xpath="devicePorts/devicePort"/>

                    <xs:selector xpath="devicePorts/devicePort"/>

                    <xs:field xpath="@tagName"/>

                    <xs:field xpath="@tagName"/>

                </xs:key>

                </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:keyref name="defaultOutputDeviceRef" refer="devicePortNameKey">

                    <xs:selector xpath="defaultOutputDevice"/>

                    <xs:selector xpath="defaultOutputDevice"/>

                    <xs:field xpath="."/>

                    <xs:field xpath="."/>
@@ -419,7 +424,7 @@ 
                    <xs:attribute name="tagName" type="xs:token" use="required"/>

                    <xs:attribute name="tagName" type="xs:token" use="required"/>

                    <xs:attribute name="type" type="audioDevice" use="required"/>

                    <xs:attribute name="type" type="audioDevice" use="required"/>

                    <xs:attribute name="role" type="role" 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:complexType>

                <xs:unique name="devicePortProfileUniqueness">

                <xs:unique name="devicePortProfileUniqueness">

                    <xs:selector xpath="profile"/>

                    <xs:selector xpath="profile"/>