commit 7c2b5ed7a1a0231f9840773e68de9dd1209ee8fa
author Mikhail Naganov <mnaganov@google.com> Sat Dec 17 01:23:47 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 17 01:23:47 2022 +0000
tree 3cd0b57d0e3b3142a45d8a3d24520e40710b45cc
parent f49af6b686dc317e121fc1f43c0326f528b75650
parent 8230457989d63c3479604a08120dbf3692fbf94a

Merge "audio: Fix streamCommon nullptr check in VTS"

audio/aidl/default/config/audioPolicy/api/current.txt

diff --git a/audio/aidl/default/config/audioPolicy/api/current.txt b/audio/aidl/default/config/audioPolicy/api/current.txt
index 5a8b970..ad79a0c 100644
--- a/audio/aidl/default/config/audioPolicy/api/current.txt
+++ b/audio/aidl/default/config/audioPolicy/api/current.txt
@@ -167,6 +167,7 @@
     method @NonNull public String getRawName();
     enum_constant public static final android.audio.policy.configuration.AudioEncapsulationType AUDIO_ENCAPSULATION_TYPE_IEC61937;
     enum_constant public static final android.audio.policy.configuration.AudioEncapsulationType AUDIO_ENCAPSULATION_TYPE_NONE;
+    enum_constant public static final android.audio.policy.configuration.AudioEncapsulationType AUDIO_ENCAPSULATION_TYPE_PCM;
   }
 
   public enum AudioFormat {

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

diff --git a/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd b/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd
index ddaa122..301c969 100644
--- a/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd
+++ b/audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd
@@ -576,6 +576,7 @@
         <xs:restriction base="xs:string">
             <xs:enumeration value="AUDIO_ENCAPSULATION_TYPE_NONE"/>
             <xs:enumeration value="AUDIO_ENCAPSULATION_TYPE_IEC61937"/>
+            <xs:enumeration value="AUDIO_ENCAPSULATION_TYPE_PCM"/>
         </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="profile">