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

media/libaudioclient/AudioSystem.cpp

diff --git a/media/libaudioclient/AudioSystem.cpp b/media/libaudioclient/AudioSystem.cpp
index a64960a..b9f418a 100644
--- a/media/libaudioclient/AudioSystem.cpp
+++ b/media/libaudioclient/AudioSystem.cpp
@@ -1584,7 +1584,7 @@
     const sp<IAudioPolicyService>& aps = AudioSystem::get_audio_policy_service();
     if (aps == 0) return PERMISSION_DENIED;
 
-    media::AudioPatch patchAidl = VALUE_OR_RETURN_STATUS(
+    media::AudioPatchFw patchAidl = VALUE_OR_RETURN_STATUS(
             legacy2aidl_audio_patch_AudioPatch(*patch));
     int32_t handleAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_patch_handle_t_int32_t(*handle));
     RETURN_STATUS_IF_ERROR(
@@ -1615,7 +1615,7 @@
 
     Int numPatchesAidl;
     numPatchesAidl.value = VALUE_OR_RETURN_STATUS(convertIntegral<int32_t>(*num_patches));
-    std::vector<media::AudioPatch> patchesAidl;
+    std::vector<media::AudioPatchFw> patchesAidl;
     int32_t generationAidl;
 
     RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(