commit 3afdbd14a93808e20677d6d0c889a8834f85e823
author Atneya Nair <atneya@google.com> Sun Dec 18 16:14:18 2022 -0800
committer Atneya Nair <atneya@google.com> Sun Dec 18 18:45:41 2022 -0800
tree b0b5c275cc1adb4e21579bb24f75fbf7c6ef2c8e
parent 638a6e408f6d6df47a828e32822be74fcad82cc4

Rename AudioPatch to AudioPatchFw

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

Test: Compiles
Bug: 262989508
Change-Id: I22ffe28ade6bed754556145567dc4919e868547d

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 2bbb1fd..b83ea39 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -1541,7 +1541,8 @@
     return Status::ok();
 }
 
-Status AudioPolicyService::createAudioPatch(const media::AudioPatch& patchAidl, int32_t handleAidl,
+Status AudioPolicyService::createAudioPatch(const media::AudioPatchFw& patchAidl,
+                                            int32_t handleAidl,
                                             int32_t* _aidl_return) {
     audio_patch patch = VALUE_OR_RETURN_BINDER_STATUS(
             aidl2legacy_AudioPatch_audio_patch(patchAidl));
@@ -1582,7 +1583,7 @@
 }
 
 Status AudioPolicyService::listAudioPatches(Int* count,
-                                            std::vector<media::AudioPatch>* patchesAidl,
+                                            std::vector<media::AudioPatchFw>* patchesAidl,
                                             int32_t* _aidl_return) {
     unsigned int num_patches = VALUE_OR_RETURN_BINDER_STATUS(
             convertIntegral<unsigned int>(count->value));