commit d9b4080d91963ff1b7d151e6a9883f44bafd499a
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 16 23:15:08 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 16 23:15:08 2022 +0000
tree a0b754896176fa54da93e363cf3efecf2b656c88
parent 8018bcb90695b2bc23dde771c9914049a82abfa7
parent 01ef00b0a8644b358d66f0a231b4497803d21f92

Merge "Update VtsHalAudioPolicyV1_0TargetTest to match XML changes" am: 01ef00b0a8

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

Change-Id: Ic4ef8bc02770ca5d645e57d6855b9a212f7b7950
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 29a9cd4..0b77d45 100644
--- a/audio/policy/1.0/xml/api/current.txt
+++ b/audio/policy/1.0/xml/api/current.txt
@@ -232,10 +232,12 @@
 
   public class ValueType {
     ctor public ValueType();
+    method public String getAndroid_type();
     method public String getLiteral();
-    method public int getNumerical();
+    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 842e724..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,9 +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="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"/>