commit 2e8490d66032ced4f9abff05bf71410dc9a23170
author Mikhail Naganov <mnaganov@google.com> Sat May 21 00:09:34 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 21 00:09:34 2022 +0000
tree 707b2a90e95abe0f5d339450be0388fab74b25bb
parent 22c1d38f6075a8e631eec061713a80f07ee1c62d
parent ceae2a604e9fab4a65e626d253d0bfecfe83828f

Update VtsHalAudioPolicyV1_0TargetTest to match XML changes am: ceae2a604e

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

Change-Id: Ic212038e12f8d0875268aa52b4f08ef96269e581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

audio/policy/1.0/xml/api/current.txt

diff --git a/audio/policy/1.0/xml/api/current.txt b/audio/policy/1.0/xml/api/current.txt
index 1478381..0b77d45 100644
--- a/audio/policy/1.0/xml/api/current.txt
+++ b/audio/policy/1.0/xml/api/current.txt
@@ -232,12 +232,12 @@
 
   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 {

audio/policy/1.0/xml/audio_policy_engine_configuration.xsd

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 852ea77..3ce12e7 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"/>