Merge changes I8ae16870,Ic0eb09df am: 6a1a60e220 am: c519d81ac3 am: dd3ffacc36

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314f7aa243441e793eca9f2a139e161b38c648ee
This commit is contained in:
Treehugger Robot
2021-02-08 10:05:17 +00:00
committed by Automerger Merge Worker
4 changed files with 16 additions and 16 deletions

View File

@@ -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 {

View File

@@ -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>

View File

@@ -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 {

View File

@@ -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>