commit ddceeccb8ae7c68c40cebbad304285637ccdb312
author Mikhail Naganov <mnaganov@google.com> Fri Sep 03 13:58:56 2021 -0700
committer Mikhail Naganov <mnaganov@google.com> Fri Sep 03 17:16:54 2021 -0700
tree 03fe24180a3fdb58e43ea32fae35a8fd298c25b7
parent 94dcd2d47e216ad8f68a3f3d7cb348dae7a8443d

Move more types from android.media -> a.m.audio.common SAIDL

Move types that are known to be used by audio HALs
(those listed in h/i/audio/common/7.0/types.hal):

 - AudioContentType
 - AudioEncapsulationMetadataType
 - AudioEncapsulationType
 - AudioMode
 - AudioSource (renamed from AudioSourceType to
     match the name of MediaRecorder.AudioSource)
 - AudioUuid

Bug: 198812639
Test: m
Test: m audioflinger_fuzzer
Change-Id: I25b4503d3bbfcba9d21cc5c628b76a6d025b709c

media/libaudioclient/PolicyAidlConversion.cpp

diff --git a/media/libaudioclient/PolicyAidlConversion.cpp b/media/libaudioclient/PolicyAidlConversion.cpp
index 676bb37..c3b7ce7 100644
--- a/media/libaudioclient/PolicyAidlConversion.cpp
+++ b/media/libaudioclient/PolicyAidlConversion.cpp
@@ -152,7 +152,7 @@
 
         case media::AudioMixMatchCriterionValue::source:
             legacy.mSource = VALUE_OR_RETURN(
-                    aidl2legacy_AudioSourceType_audio_source_t(UNION_GET(aidl, source).value()));
+                    aidl2legacy_AudioSource_audio_source_t(UNION_GET(aidl, source).value()));
             *rule |= RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET;
             return legacy;
 
@@ -184,7 +184,7 @@
 
         case RULE_MATCH_ATTRIBUTE_CAPTURE_PRESET:
             UNION_SET(aidl, source,
-                      VALUE_OR_RETURN(legacy2aidl_audio_source_t_AudioSourceType(legacy.mSource)));
+                      VALUE_OR_RETURN(legacy2aidl_audio_source_t_AudioSource(legacy.mSource)));
             break;
 
         case RULE_MATCH_UID: