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

Commit 09af1080 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update VtsHalAudioPolicyV1_0TargetTest to match XML changes" into... 

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

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



Change-Id: Ia40450c3f7c92a69b695d8bc583a99104578e022
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4beaa9a ea6cc691

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

+4 −4
Original line number Diff line number Diff line
@@ -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 {

audio/policy/1.0/xml/audio_policy_engine_configuration.xsd

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