commit 5eea7fb0d7974710049ab6e6cca00a63ff2d7a1f
author Mikhail Naganov <mnaganov@google.com> Fri Oct 13 23:38:25 2023 +0000
committer Mikhail Naganov <mnaganov@google.com> Fri Oct 13 23:38:25 2023 +0000
tree d596ba9f63f5cfe154819b0e5db0704cc213076e
parent 006a136ea79afbd0a6c68d2332bae763696d7860

Revert "audio: Populate MicrophoneInfo with vendor data"

Revert submission 2770886-AidlAudioHalModuleConfig

Reason for revert: Breaks BluetoothInstrumentationTests on main downstream

Reverted changes: /q/submissionid:2770886-AidlAudioHalModuleConfig

Bug: 305291602
Change-Id: I01a4d22056507f9047c4fead21c9a75bfa153a46

audio/aidl/default/Module.cpp

diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp
index cad239f..0cda3bd 100644
--- a/audio/aidl/default/Module.cpp
+++ b/audio/aidl/default/Module.cpp
@@ -43,7 +43,6 @@
 using aidl::android::hardware::audio::core::sounddose::ISoundDose;
 using aidl::android::media::audio::common::AudioChannelLayout;
 using aidl::android::media::audio::common::AudioDevice;
-using aidl::android::media::audio::common::AudioDeviceType;
 using aidl::android::media::audio::common::AudioFormatDescription;
 using aidl::android::media::audio::common::AudioFormatType;
 using aidl::android::media::audio::common::AudioInputFlags;
@@ -796,7 +795,7 @@
     context.fillDescriptor(&_aidl_return->desc);
     std::shared_ptr<StreamIn> stream;
     RETURN_STATUS_IF_ERROR(createInputStream(std::move(context), in_args.sinkMetadata,
-                                             getMicrophoneInfos(), &stream));
+                                             getConfig().microphones, &stream));
     StreamWrapper streamWrapper(stream);
     if (auto patchIt = mPatches.find(in_args.portConfigId); patchIt != mPatches.end()) {
         RETURN_STATUS_IF_ERROR(
@@ -1230,7 +1229,7 @@
 }
 
 ndk::ScopedAStatus Module::getMicrophones(std::vector<MicrophoneInfo>* _aidl_return) {
-    *_aidl_return = getMicrophoneInfos();
+    *_aidl_return = getConfig().microphones;
     LOG(DEBUG) << __func__ << ": returning " << ::android::internal::ToString(*_aidl_return);
     return ndk::ScopedAStatus::ok();
 }
@@ -1509,29 +1508,6 @@
     return ndk::ScopedAStatus::ok();
 }
 
-std::vector<MicrophoneInfo> Module::getMicrophoneInfos() {
-    std::vector<MicrophoneInfo> result;
-    Configuration& config = getConfig();
-    for (const AudioPort& port : config.ports) {
-        if (port.ext.getTag() == AudioPortExt::Tag::device) {
-            const AudioDeviceType deviceType =
-                    port.ext.get<AudioPortExt::Tag::device>().device.type.type;
-            if (deviceType == AudioDeviceType::IN_MICROPHONE ||
-                deviceType == AudioDeviceType::IN_MICROPHONE_BACK) {
-                // Placeholder values. Vendor implementations must populate MicrophoneInfo
-                // accordingly based on their physical microphone parameters.
-                result.push_back(MicrophoneInfo{
-                        .id = port.name,
-                        .device = port.ext.get<AudioPortExt::Tag::device>().device,
-                        .group = 0,
-                        .indexInTheGroup = 0,
-                });
-            }
-        }
-    }
-    return result;
-}
-
 Module::BtProfileHandles Module::getBtProfileManagerHandles() {
     return std::make_tuple(std::weak_ptr<IBluetooth>(), std::weak_ptr<IBluetoothA2dp>(),
                            std::weak_ptr<IBluetoothLe>());