commit cfb664c4519a66c841eb4697027bff41e09c2dcd
author Mikhail Naganov <mnaganov@google.com> Mon Feb 08 18:36:43 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 08 18:36:43 2021 +0000
tree 597862ae91df7c4ff578a86bd573cdc9cf543148
parent 75f057be3fc128068c3f98005abecb2163e21934
parent dd8f763bf14397e2fd1609f2043a78eedf6bf469

Merge "Add IEC60958 audio format" am: f45a71d1c1 am: c8a3a1ad41 am: dd8f763bf1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7a4df123444934852eaa20353fe839a3d6f55c7

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 49cfd38..653531d 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 f20033d..31ec64b 100644
--- a/audio/7.0/config/audio_policy_configuration.xsd
+++ b/audio/7.0/config/audio_policy_configuration.xsd
@@ -407,6 +407,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">