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

Commit 6a1a60e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I8ae16870,Ic0eb09df 

* changes:
  audio: Allow using vendor extensions in surround formats (V6)
  audio: Allow using vendor extensions in surround formats (V5)
parents 4a0dcd97 14fa6ee5

audio/5.0/config/api/current.txt

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

    ctor public DevicePorts.DevicePort();

    method public String getAddress();

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

    method public java.util.List<java.lang.String> 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();
@@ -207,7 +207,7 @@ package audio.policy.configuration.V5_0 { 
    method public String getType();

    method public boolean get_default();

    method public void setAddress(String);

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

    method public void setEncodedFormats(java.util.List<java.lang.String>);

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

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

    method public void setTagName(String);
@@ -380,10 +380,10 @@ package audio.policy.configuration.V5_0 { 


  public static class SurroundFormats.Format {

    ctor public SurroundFormats.Format();

    method public audio.policy.configuration.V5_0.AudioFormat getName();

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

    method public void setName(audio.policy.configuration.V5_0.AudioFormat);

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

    method public String getName();

    method public java.util.List<java.lang.String> getSubformats();

    method public void setName(String);

    method public void setSubformats(java.util.List<java.lang.String>);

  }



  public class SurroundSound {

audio/5.0/config/audio_policy_configuration.xsd

+2 −2
Original line number Diff line number Diff line
@@ -611,13 +611,13 @@ 
        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="audioFormatsList">

        <xs:list itemType="audioFormat" />

        <xs:list itemType="extendableAudioFormat" />

    </xs:simpleType>

    <xs:complexType name="surroundFormats">

        <xs:sequence>

            <xs:element name="format" minOccurs="0" maxOccurs="unbounded">

                <xs:complexType>

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

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

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

                </xs:complexType>

            </xs:element>

audio/6.0/config/api/current.txt

+6 −6
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ package audio.policy.configuration.V6_0 { 
  public static class DevicePorts.DevicePort {

    ctor public DevicePorts.DevicePort();

    method public String getAddress();

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

    method public java.util.List<java.lang.String> getEncodedFormats();

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

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

    method public audio.policy.configuration.V6_0.Role getRole();
@@ -207,7 +207,7 @@ package audio.policy.configuration.V6_0 { 
    method public String getType();

    method public boolean get_default();

    method public void setAddress(String);

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

    method public void setEncodedFormats(java.util.List<java.lang.String>);

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

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

    method public void setTagName(String);
@@ -391,10 +391,10 @@ package audio.policy.configuration.V6_0 { 


  public static class SurroundFormats.Format {

    ctor public SurroundFormats.Format();

    method public audio.policy.configuration.V6_0.AudioFormat getName();

    method public java.util.List<audio.policy.configuration.V6_0.AudioFormat> getSubformats();

    method public void setName(audio.policy.configuration.V6_0.AudioFormat);

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

    method public String getName();

    method public java.util.List<java.lang.String> getSubformats();

    method public void setName(String);

    method public void setSubformats(java.util.List<java.lang.String>);

  }



  public class SurroundSound {

audio/6.0/config/audio_policy_configuration.xsd

+2 −2
Original line number Diff line number Diff line
@@ -614,13 +614,13 @@ 
        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="audioFormatsList">

        <xs:list itemType="audioFormat" />

        <xs:list itemType="extendableAudioFormat" />

    </xs:simpleType>

    <xs:complexType name="surroundFormats">

        <xs:sequence>

            <xs:element name="format" minOccurs="0" maxOccurs="unbounded">

                <xs:complexType>

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

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

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

                </xs:complexType>

            </xs:element>