Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VtsHalAudioPolicyV1_0TargetTest to match XML changes

Browse Source 
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
This commit is contained in:
Mikhail Naganov
2022-05-11 22:12:00 +00:00
parent 82c115a87c
commit 356bb458dc
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
audio/policy/1.0/xml/api/current.txt
View File

@@ -232,12 +232,12 @@ package audio.policy.V1_0 {
public class ValueType { public class ValueType {
ctor public ValueType(); ctor public ValueType();
method public int getAndroid_type(); method public String getAndroid_type();
method public String getLiteral(); method public String getLiteral();
method public int getNumerical(); method public long getNumerical();
method public void setAndroid_type(int); method public void setAndroid_type(String);
method public void setLiteral(String); method public void setLiteral(String);
method public void setNumerical(int); method public void setNumerical(long);
} }
public class ValuesType { public class ValuesType {

14
audio/policy/1.0/xml/audio_policy_engine_configuration.xsd
View File

@@ -189,10 +189,20 @@
</xs:complexType> </xs:complexType>
<xs:complexType name="valueType"> <xs:complexType name="valueType">
<xs:attribute name="literal" type="xs:string" use="required"/> <xs:attribute name="literal" type="xs:string" use="required"/>
<xs:attribute name="numerical" type="xs:int" use="required"/> <xs:attribute name="numerical" type="xs:long" use="required"/>
<xs:attribute name="android_type" type="xs:int" use="optional"/> <xs:attribute name="android_type" type="longDecimalOrHexType" use="optional"/>
</xs:complexType> </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:complexType name="attributesRefType">
<xs:sequence> <xs:sequence>
<xs:element name="Attributes" type="AttributesType" minOccurs="1" maxOccurs="1"/> <xs:element name="Attributes" type="AttributesType" minOccurs="1" maxOccurs="1"/>