diff options
| -rw-r--r-- | audio/policy/1.0/xml/api/current.txt | 8 | ||||
| -rw-r--r-- | audio/policy/1.0/xml/audio_policy_engine_configuration.xsd | 14 |
2 files changed, 16 insertions, 6 deletions
diff --git a/audio/policy/1.0/xml/api/current.txt b/audio/policy/1.0/xml/api/current.txt index 14783810a0..0b77d45539 100644 --- a/audio/policy/1.0/xml/api/current.txt +++ b/audio/policy/1.0/xml/api/current.txt @@ -232,12 +232,12 @@ package audio.policy.V1_0 { public class ValueType { ctor public ValueType(); - method public int getAndroid_type(); + method public String getAndroid_type(); method public String getLiteral(); - method public int getNumerical(); - method public void setAndroid_type(int); + method public long getNumerical(); + method public void setAndroid_type(String); method public void setLiteral(String); - method public void setNumerical(int); + method public void setNumerical(long); } public class ValuesType { diff --git a/audio/policy/1.0/xml/audio_policy_engine_configuration.xsd b/audio/policy/1.0/xml/audio_policy_engine_configuration.xsd index 852ea77dac..3ce12e709b 100644 --- a/audio/policy/1.0/xml/audio_policy_engine_configuration.xsd +++ b/audio/policy/1.0/xml/audio_policy_engine_configuration.xsd @@ -189,10 +189,20 @@ </xs:complexType> <xs:complexType name="valueType"> <xs:attribute name="literal" type="xs:string" use="required"/> - <xs:attribute name="numerical" type="xs:int" use="required"/> - <xs:attribute name="android_type" type="xs:int" use="optional"/> + <xs:attribute name="numerical" type="xs:long" use="required"/> + <xs:attribute name="android_type" type="longDecimalOrHexType" use="optional"/> </xs:complexType> + <xs:simpleType name="longDecimalOrHexType"> + <xs:union memberTypes="xs:long longHexType" /> + </xs:simpleType> + + <xs:simpleType name="longHexType"> + <xs:restriction base="xs:string"> + <xs:pattern value="0x[0-9A-Fa-f]{1,16}"/> + </xs:restriction> + </xs:simpleType> + <xs:complexType name="attributesRefType"> <xs:sequence> <xs:element name="Attributes" type="AttributesType" minOccurs="1" maxOccurs="1"/> |