diff options
author | Kevin Rocard | 2017-12-06 13:30:44 -0600 |
---|---|---|
committer | android-build-merger | 2017-12-06 13:30:44 -0600 |
commit | d4112727b7aa2f7ca63c2bdbfcac612603d908af (patch) | |
tree | 3030f0a6b9fe339fdc80f9f6b5296f12cd29ce59 | |
parent | ec55b2f024e7f54d9a76c40d85b17ef1adf84db5 (diff) | |
parent | fa1f597442a8b99f34a03013b5c5eeab779d65ed (diff) | |
download | platform-hardware-interfaces-d4112727b7aa2f7ca63c2bdbfcac612603d908af.tar.gz platform-hardware-interfaces-d4112727b7aa2f7ca63c2bdbfcac612603d908af.tar.xz platform-hardware-interfaces-d4112727b7aa2f7ca63c2bdbfcac612603d908af.zip |
Audio policy config: Device port (type,address) must be unique
am: fa1f597442
Change-Id: I03176086075fb2c2911edf3a470b0319cb8648b6
-rw-r--r-- | audio/2.0/config/audio_policy_configuration.xsd | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/audio/2.0/config/audio_policy_configuration.xsd b/audio/2.0/config/audio_policy_configuration.xsd index 8c05763d..0a52b559 100644 --- a/audio/2.0/config/audio_policy_configuration.xsd +++ b/audio/2.0/config/audio_policy_configuration.xsd | |||
@@ -148,6 +148,11 @@ | |||
148 | <xs:selector xpath="devicePorts/devicePort"/> | 148 | <xs:selector xpath="devicePorts/devicePort"/> |
149 | <xs:field xpath="@tagName"/> | 149 | <xs:field xpath="@tagName"/> |
150 | </xs:key> | 150 | </xs:key> |
151 | <xs:unique name="devicePortUniqueness"> | ||
152 | <xs:selector xpath="devicePorts/devicePort"/> | ||
153 | <xs:field xpath="@type"/> | ||
154 | <xs:field xpath="@address"/> | ||
155 | </xs:unique> | ||
151 | <xs:keyref name="defaultOutputDeviceRef" refer="devicePortNameKey"> | 156 | <xs:keyref name="defaultOutputDeviceRef" refer="devicePortNameKey"> |
152 | <xs:selector xpath="defaultOutputDevice"/> | 157 | <xs:selector xpath="defaultOutputDevice"/> |
153 | <xs:field xpath="."/> | 158 | <xs:field xpath="."/> |
@@ -419,7 +424,7 @@ | |||
419 | <xs:attribute name="tagName" type="xs:token" use="required"/> | 424 | <xs:attribute name="tagName" type="xs:token" use="required"/> |
420 | <xs:attribute name="type" type="audioDevice" use="required"/> | 425 | <xs:attribute name="type" type="audioDevice" use="required"/> |
421 | <xs:attribute name="role" type="role" use="required"/> | 426 | <xs:attribute name="role" type="role" use="required"/> |
422 | <xs:attribute name="address" type="xs:string" use="optional"/> | 427 | <xs:attribute name="address" type="xs:string" use="optional" default=""/> |
423 | </xs:complexType> | 428 | </xs:complexType> |
424 | <xs:unique name="devicePortProfileUniqueness"> | 429 | <xs:unique name="devicePortProfileUniqueness"> |
425 | <xs:selector xpath="profile"/> | 430 | <xs:selector xpath="profile"/> |