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

Commit d185cad4 authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge "Add sub-elements for "Variant" type" into qt-dev 

am: 2322d0f7

Change-Id: Id7bd4320a593fa6a05ea2114690d7d9627d3d7fe
parents 2da41171 2322d0f7

media/libstagefright/xmlparser/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -138,7 +138,12 @@ package media.codecs { 


  public class Variant {

    ctor public Variant();

    method public java.util.List<media.codecs.Alias> getAlias_optional();

    method public java.util.List<media.codecs.Quirk> getAttribute_optional();

    method public java.util.List<media.codecs.Feature> getFeature_optional();

    method public java.util.List<media.codecs.Limit> getLimit_optional();

    method public String getName();

    method public java.util.List<media.codecs.Quirk> getQuirk_optional();

    method public void setName(String);

  }

media/libstagefright/xmlparser/media_codecs.xsd

+7 −0
Original line number Diff line number Diff line
@@ -107,6 +107,13 @@ 
        <xs:attribute name="value" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Variant">

        <xs:choice minOccurs="0" maxOccurs="unbounded">

            <xs:element name="Quirk" type="Quirk"/>

            <xs:element name="Attribute" type="Quirk"/>

            <xs:element name="Alias" type="Alias"/>

            <xs:element name="Limit" type="Limit"/>

            <xs:element name="Feature" type="Feature"/>

        </xs:choice>

        <xs:attribute name="name" type="xs:string"/>

    </xs:complexType>

    <xs:complexType name="Setting">