commit f45a71d1c1cd133f71ddb4d2492ace5adc39fa1c
author Mikhail Naganov <mnaganov@google.com> Mon Feb 08 16:59:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 08 16:59:13 2021 +0000
tree ccc1fc2ed836dc1ced9641de4d44f1bea84c7238
parent 2679ad6f242b9b66a8e4c4651061096284e2292e
parent 4a645c3f973b04fda4a08f3e3476f80f45d68fc5

Merge "Add IEC60958 audio format"

audio/7.0/config/api/current.txt

diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt
index 8fb8036..48093c5 100644
--- a/audio/7.0/config/api/current.txt
+++ b/audio/7.0/config/api/current.txt
@@ -212,6 +212,7 @@
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_FLAC;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_HE_AAC_V1;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_HE_AAC_V2;
+    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_IEC60958;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_IEC61937;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_LC3;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_LDAC;

audio/7.0/config/audio_policy_configuration.xsd

diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd
index 40dc6f2..531572b 100644
--- a/audio/7.0/config/audio_policy_configuration.xsd
+++ b/audio/7.0/config/audio_policy_configuration.xsd
@@ -406,6 +406,7 @@
             <xs:enumeration value="AUDIO_FORMAT_MPEGH_BL_L4"/>
             <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L3"/>
             <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L4"/>
+            <xs:enumeration value="AUDIO_FORMAT_IEC60958"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="extendableAudioFormat">