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

Commit 1a656560 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: Add 'encodedFormats' field to 'devicePort'"

parents 43dc26ad ee6772e1

audio/5.0/config/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ package audio.policy.configuration.V5_0 { 
  public static class DevicePorts.DevicePort {

    ctor public DevicePorts.DevicePort();

    method public java.lang.String getAddress();

    method public java.util.List<audio.policy.configuration.V5_0.AudioFormat> getEncodedFormats();

    method public audio.policy.configuration.V5_0.Gains getGains();

    method public java.util.List<audio.policy.configuration.V5_0.Profile> getProfile();

    method public audio.policy.configuration.V5_0.Role getRole();
@@ -201,6 +202,7 @@ package audio.policy.configuration.V5_0 { 
    method public java.lang.String getType();

    method public boolean get_default();

    method public void setAddress(java.lang.String);

    method public void setEncodedFormats(java.util.List<audio.policy.configuration.V5_0.AudioFormat>);

    method public void setGains(audio.policy.configuration.V5_0.Gains);

    method public void setRole(audio.policy.configuration.V5_0.Role);

    method public void setTagName(java.lang.String);

audio/5.0/config/audio_policy_configuration.xsd

+4 −2
Original line number Diff line number Diff line
@@ -461,6 +461,8 @@ 
                            </xs:documentation>

                        </xs:annotation>

                    </xs:attribute>

                    <xs:attribute name="encodedFormats" type="audioFormatsList" use="optional"

                                  default="" />

                </xs:complexType>

                <xs:unique name="devicePortProfileUniqueness">

                    <xs:selector xpath="profile"/>
@@ -595,7 +597,7 @@ 
            <xs:element name="formats" type="surroundFormats"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="surroundFormatsList">

    <xs:simpleType name="audioFormatsList">

        <xs:list itemType="audioFormat" />

    </xs:simpleType>

    <xs:complexType name="surroundFormats">
@@ -603,7 +605,7 @@ 
            <xs:element name="format" minOccurs="0" maxOccurs="unbounded">

                <xs:complexType>

                    <xs:attribute name="name" type="audioFormat" use="required"/>

                    <xs:attribute name="subformats" type="surroundFormatsList" />

                    <xs:attribute name="subformats" type="audioFormatsList" />

                </xs:complexType>

            </xs:element>

        </xs:sequence>