| commit | c18e9a10af774bce4a6525b7c883daab03fa4756 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] |
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
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h index 87e6974..2159257 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.h +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -1010,7 +1010,7 @@ // Called by setDeviceConnectionState() status_t deviceToAudioPort(audio_devices_t deviceType, const char* device_address, - const char* device_name, media::AudioPort* aidPort); + const char* device_name, media::AudioPortFw* aidPort); bool isMsdPatch(const audio_patch_handle_t &handle) const; private: