audio: Allow using vendor extensions in surround formats (V5)

The 'surroundFormats' section must allow specifying
vendor-provided formats (vendor extensions). This has been
fixed in Audio HAL V7. Backporting to earlier versions.

Bug: 173647783
Test: atest VtsHalAudioV5_0TargetTest
Change-Id: Ic0eb09df927af243d56038a8a102f0607bbaafaf
(cherry picked from commit 8844e5b92d)
This commit is contained in:
Mikhail Naganov
2021-02-04 15:52:55 -08:00
parent db2d4be7fe
commit c0525521bb
2 changed files with 8 additions and 8 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>