commit 0b58fe149621e41346285903655b9b0b794bb4a2
author Andy Hung <hunga@google.com> Fri Apr 30 20:52:45 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 30 20:52:45 2021 +0000
tree 33032a84df17e03506798d4ae119eac8fa41a86f
parent a21b9b5d4e223b6fea62b651b6b0fc44755769df
parent b76d8e27fb6b87a316f81b8d42265c4aec41e2a8

Merge changes from topics "dra", "dts_uhd", "earc" am: b76d8e27fb

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

Change-Id: Iab845c4dacfda0ad2cf7ee09f5ba11cb27bdad8c

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 3d3f6c3..c2585bd 100644
--- a/audio/7.0/config/api/current.txt
+++ b/audio/7.0/config/api/current.txt
@@ -210,6 +210,7 @@
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_CELT;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DEFAULT;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DOLBY_TRUEHD;
+    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DRA;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DSD;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_HD;

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 ba1cd92..e0df359 100644
--- a/audio/7.0/config/audio_policy_configuration.xsd
+++ b/audio/7.0/config/audio_policy_configuration.xsd
@@ -414,6 +414,7 @@
             <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L4"/>
             <xs:enumeration value="AUDIO_FORMAT_IEC60958"/>
             <xs:enumeration value="AUDIO_FORMAT_DTS_UHD"/>
+            <xs:enumeration value="AUDIO_FORMAT_DRA"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="extendableAudioFormat">