diff options
| author | Kevin Rocard <krocard@google.com> | 2017-12-06 19:36:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-06 19:36:08 +0000 |
| commit | 7c7fc0c69a490f71e1ba8aef440734efc9185d1c (patch) | |
| tree | b31244f7db1cefd72f09e38b25186359c795b7c3 /audio/2.0 | |
| parent | 540748bc8023e122c9f82656b3bc2c569f3f9b6b (diff) | |
| parent | d4112727b7aa2f7ca63c2bdbfcac612603d908af (diff) | |
| download | platform_hardware_interfaces-7c7fc0c69a490f71e1ba8aef440734efc9185d1c.tar.gz platform_hardware_interfaces-7c7fc0c69a490f71e1ba8aef440734efc9185d1c.tar.bz2 platform_hardware_interfaces-7c7fc0c69a490f71e1ba8aef440734efc9185d1c.zip | |
Audio policy config: Device port (type,address) must be unique am: fa1f597442
am: d4112727b7
Change-Id: I4d24d58034d3a39fee66308b44620c956ad5c345
Diffstat (limited to 'audio/2.0')
| -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 8c05763dd2..0a52b55932 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"/> |