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

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index 0d16f47..f83a39e 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -1618,7 +1618,7 @@
     const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
     if (aps == 0) return PERMISSION_DENIED;
 
-    media::AudioPortConfig configAidl = VALUE_OR_RETURN_STATUS(
+    media::AudioPortConfigFw configAidl = VALUE_OR_RETURN_STATUS(
             legacy2aidl_audio_port_config_AudioPortConfig(*config));
     return statusTFromBinderStatus(aps->setAudioPortConfig(configAidl));
 }
@@ -1839,7 +1839,7 @@
     const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
     if (aps == 0) return PERMISSION_DENIED;
 
-    media::AudioPortConfig sourceAidl = VALUE_OR_RETURN_STATUS(
+    media::AudioPortConfigFw sourceAidl = VALUE_OR_RETURN_STATUS(
             legacy2aidl_audio_port_config_AudioPortConfig(*source));
     media::AudioAttributesInternal attributesAidl = VALUE_OR_RETURN_STATUS(
             legacy2aidl_audio_attributes_t_AudioAttributesInternal(*attributes));