Merge "Update VtsHalAudioPolicyV1_0TargetTest to match XML changes" into tm-dev-plus-aosp am: ea6cc6914d am: 09af1080e8

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18356403

Change-Id: Ib078106ddd69c0290229d5ba20989cf874d7364c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-13 19:49:22 +00:00
committed by Automerger Merge Worker
2 changed files with 16 additions and 6 deletions

View File

@@ -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 {

View File

@@ -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"/>