diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2022-05-11 22:12:00 +0000 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2022-05-19 16:48:47 +0000 |
| commit | ceae2a604e9fab4a65e626d253d0bfecfe83828f (patch) | |
| tree | 707b2a90e95abe0f5d339450be0388fab74b25bb | |
| parent | 479ec9e172e9b302512171e1f236e90ccdfe6597 (diff) | |
Update VtsHalAudioPolicyV1_0TargetTest to match XML changes
There was a proposal for a backward-compatible XML schema change
(https://android-review.googlesource.com/q/I1bf31c6bf6c57c9b79f0d5751601aa77780f1f80)
which had a mistake. Express the change correctly to match
the implementation.
Bug: 231929160
Test: atest VtsHalAudioPolicyV1_0TargetTest
Change-Id: Id581e290740a3c00ba3719a339c9bc47d730f35c
(cherry picked from commit 356bb458dc5b5e79a9aee89098a49e8865baa144)
Merged-In: Id581e290740a3c00ba3719a339c9bc47d730f35c
| -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"/> |