commit b8de69bcfd5b5dc6728f269406c7afb4e9b0417a
author Atneya Nair <atneya@google.com> Sun Dec 18 17:26:26 2022 -0800
committer Mikhail Naganov <mnaganov@google.com> Sat Jan 14 18:49:31 2023 +0000
tree bc0566bcabe272fee14f481938229c17e0be40f7
parent 4608dacab41023f7c2ec97e6f7b60738809173d3

Rename AudioPortConfig to AudioPortConfigFw

There is a namespace conflict between the AIDL generated
android.media.AudioPortConfig, and the android.media.AudioPortConfig
included in the SDK. Renaming to avoid.

Test: Compiles
Bug: 262989508
Change-Id: I3f1ad6e887d96e1724a6ccd1eef6747ba153c036
Merged-In: I3f1ad6e887d96e1724a6ccd1eef6747ba153c036

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index df49bba..f093ee7 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -1633,7 +1633,7 @@
     return Status::ok();
 }
 
-Status AudioPolicyService::setAudioPortConfig(const media::AudioPortConfig& configAidl)
+Status AudioPolicyService::setAudioPortConfig(const media::AudioPortConfigFw& configAidl)
 {
     audio_port_config config = VALUE_OR_RETURN_BINDER_STATUS(
             aidl2legacy_AudioPortConfig_audio_port_config(configAidl));
@@ -1806,7 +1806,7 @@
     return binderStatusFromStatusT(mAudioPolicyManager->removeUserIdDeviceAffinities(userId));
 }
 
-Status AudioPolicyService::startAudioSource(const media::AudioPortConfig& sourceAidl,
+Status AudioPolicyService::startAudioSource(const media::AudioPortConfigFw& sourceAidl,
                                             const media::AudioAttributesInternal& attributesAidl,
                                             int32_t* _aidl_return) {
     audio_port_config source = VALUE_OR_RETURN_BINDER_STATUS(