commit 6edb87002293d20bb19014ca7d0e17878c567094
author Andy Hung <hunga@google.com> Fri Apr 30 21:28:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 30 21:28:33 2021 +0000
tree d8213efc4a3dd8f606decb4fa30c57f612a41d94
parent e89f9b8e30a07210ff4f82c92b480aaf3b8831cc
parent 24556f0dfeb0ae2c81944245cf16b17809802820

Audio: Add AUDIO_FORMAT_DTS_UHD am: 3c5fcc51f5 am: 24556f0dfe

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

Change-Id: Iee1f48feeb4e067daef3e46a94145c60a34a33af

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 b5b3925..b4ad338 100644
--- a/audio/7.0/config/api/current.txt
+++ b/audio/7.0/config/api/current.txt
@@ -211,6 +211,7 @@
     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;
+    enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_UHD;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRC;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRCB;
     enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRCNW;

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 4f5614b..7b0d897 100644
--- a/audio/7.0/config/audio_policy_configuration.xsd
+++ b/audio/7.0/config/audio_policy_configuration.xsd
@@ -411,6 +411,7 @@
             <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L3"/>
             <xs:enumeration value="AUDIO_FORMAT_MPEGH_LC_L4"/>
             <xs:enumeration value="AUDIO_FORMAT_IEC60958"/>
+            <xs:enumeration value="AUDIO_FORMAT_DTS_UHD"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:simpleType name="extendableAudioFormat">