Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55dd33f1 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

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
Merged-In: Id581e290740a3c00ba3719a339c9bc47d730f35c
(cherry picked from commit e01186e1)
parent c0fd0005

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

+4 −2
Original line number Diff line number Diff line
@@ -236,10 +236,12 @@ package audio.policy.V1_0 { 


  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

+12 −1
Original line number Diff line number Diff line
@@ -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"/>