commit c18e9a10af774bce4a6525b7c883daab03fa4756
author Atneya Nair <atneya@google.com> Sun Dec 18 16:45:15 2022 -0800
committer Mikhail Naganov <mnaganov@google.com> Sat Jan 14 18:49:40 2023 +0000
tree 5decf0e21a2f3e2a09dfadc4ce2bbf4e7e6a462e
parent b8de69bcfd5b5dc6728f269406c7afb4e9b0417a

Rename AudioPort to AudioPortFw

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

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

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index f093ee7..937326a 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -1521,7 +1521,7 @@
 
 Status AudioPolicyService::listAudioPorts(media::AudioPortRole roleAidl,
                                           media::AudioPortType typeAidl, Int* count,
-                                          std::vector<media::AudioPort>* portsAidl,
+                                          std::vector<media::AudioPortFw>* portsAidl,
                                           int32_t* _aidl_return) {
     audio_port_role_t role = VALUE_OR_RETURN_BINDER_STATUS(
             aidl2legacy_AudioPortRole_audio_port_role_t(roleAidl));
@@ -1553,7 +1553,7 @@
 }
 
 Status AudioPolicyService::getAudioPort(int portId,
-                                        media::AudioPort* _aidl_return) {
+                                        media::AudioPortFw* _aidl_return) {
     audio_port_v7 port{ .id = portId };
     Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {