| 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/tests/audiopolicymanager_tests.cpp b/services/audiopolicy/tests/audiopolicymanager_tests.cpp index c341b32..1c40cfd 100644 --- a/services/audiopolicy/tests/audiopolicymanager_tests.cpp +++ b/services/audiopolicy/tests/audiopolicymanager_tests.cpp
@@ -1790,7 +1790,7 @@ } const std::string name = std::get<1>(GetParam()); const std::string address = std::get<2>(GetParam()); - android::media::AudioPort audioPort; + android::media::AudioPortFw audioPort; ASSERT_EQ(NO_ERROR, mManager->deviceToAudioPort(type, address.c_str(), name.c_str(), &audioPort)); android::media::audio::common::AudioPort& port = audioPort.hal;