diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2021-02-04 15:52:55 -0800 |
|---|---|---|
| committer | Mikhail Naganov <mnaganov@google.com> | 2021-02-09 01:34:22 +0000 |
| commit | c0525521bbc19c85d96a18baa8e48928f1bd5bfb (patch) | |
| tree | 05e17f97b7488a2dce7eeaa86283b3fd6248721e | |
| parent | db2d4be7fec5a7aa1cbc80fe1ef9c49db370efce (diff) | |
| download | platform_hardware_interfaces-c0525521bbc19c85d96a18baa8e48928f1bd5bfb.tar.gz platform_hardware_interfaces-c0525521bbc19c85d96a18baa8e48928f1bd5bfb.tar.bz2 platform_hardware_interfaces-c0525521bbc19c85d96a18baa8e48928f1bd5bfb.zip | |
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 8844e5b92d4ee147eb07bf5fd528f2d14fda2c3a)
| -rw-r--r-- | audio/5.0/config/api/current.txt | 12 | ||||
| -rw-r--r-- | audio/5.0/config/audio_policy_configuration.xsd | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/audio/5.0/config/api/current.txt b/audio/5.0/config/api/current.txt index 8458a569c5..dbb5d3bbd6 100644 --- a/audio/5.0/config/api/current.txt +++ b/audio/5.0/config/api/current.txt @@ -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 { diff --git a/audio/5.0/config/audio_policy_configuration.xsd b/audio/5.0/config/audio_policy_configuration.xsd index b0d1e204bb..f92136cf0a 100644 --- a/audio/5.0/config/audio_policy_configuration.xsd +++ b/audio/5.0/config/audio_policy_configuration.xsd @@ -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> |