Revert "audio: Set connectedProfiles for non-attached device ports." am: 006a136ea7 am: bfe40ea2b0 am: 238ac10089 am: 21da9979f0 am: 3d8be4767a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2786755
Change-Id: I4c2c62270787f883b86424c9c80d65fb03783b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/Configuration.cpp b/audio/aidl/default/Configuration.cpp
index d09552b..cf5f066 100644
--- a/audio/aidl/default/Configuration.cpp
+++ b/audio/aidl/default/Configuration.cpp
@@ -135,22 +135,6 @@
return route;
}
-std::vector<AudioProfile> getStandard16And24BitPcmAudioProfiles() {
- auto createStdPcmAudioProfile = [](const PcmType& pcmType) {
- return AudioProfile{
- .format = AudioFormatDescription{.type = AudioFormatType::PCM, .pcm = pcmType},
- .channelMasks = {AudioChannelLayout::make<AudioChannelLayout::layoutMask>(
- AudioChannelLayout::LAYOUT_MONO),
- AudioChannelLayout::make<AudioChannelLayout::layoutMask>(
- AudioChannelLayout::LAYOUT_STEREO)},
- .sampleRates = {8000, 11025, 16000, 32000, 44100, 48000}};
- };
- return {
- createStdPcmAudioProfile(PcmType::INT_16_BIT),
- createStdPcmAudioProfile(PcmType::INT_24_BIT),
- };
-}
-
// Primary (default) configuration:
//
// Device ports:
diff --git a/audio/aidl/default/Module.cpp b/audio/aidl/default/Module.cpp
index 1ec171a..e9be348 100644
--- a/audio/aidl/default/Module.cpp
+++ b/audio/aidl/default/Module.cpp
@@ -185,11 +185,6 @@
return os;
}
-Module::Module(Type type, std::unique_ptr<Configuration>&& config)
- : mType(type), mConfig(std::move(config)) {
- populateConnectedProfiles();
-}
-
void Module::cleanUpPatch(int32_t patchId) {
erase_all_values(mPatches, std::set<int32_t>{patchId});
}
@@ -330,22 +325,6 @@
return ndk::ScopedAStatus::ok();
}
-void Module::populateConnectedProfiles() {
- Configuration& config = getConfig();
- for (const AudioPort& port : config.ports) {
- if (port.ext.getTag() == AudioPortExt::device) {
- if (auto devicePort = port.ext.get<AudioPortExt::device>();
- !devicePort.device.type.connection.empty() && port.profiles.empty()) {
- if (auto connIt = config.connectedProfiles.find(port.id);
- connIt == config.connectedProfiles.end()) {
- config.connectedProfiles.emplace(
- port.id, internal::getStandard16And24BitPcmAudioProfiles());
- }
- }
- }
- }
-}
-
template <typename C>
std::set<int32_t> Module::portIdsFromPortConfigIds(C portConfigIds) {
std::set<int32_t> result;
diff --git a/audio/aidl/default/include/core-impl/Configuration.h b/audio/aidl/default/include/core-impl/Configuration.h
index a56c8c9..aa7b9ff 100644
--- a/audio/aidl/default/include/core-impl/Configuration.h
+++ b/audio/aidl/default/include/core-impl/Configuration.h
@@ -23,7 +23,5 @@
namespace aidl::android::hardware::audio::core::internal {
std::unique_ptr<Module::Configuration> getConfiguration(Module::Type moduleType);
-std::vector<aidl::android::media::audio::common::AudioProfile>
-getStandard16And24BitPcmAudioProfiles();
} // namespace aidl::android::hardware::audio::core::internal
diff --git a/audio/aidl/default/include/core-impl/Module.h b/audio/aidl/default/include/core-impl/Module.h
index d92d54b..c269cc1 100644
--- a/audio/aidl/default/include/core-impl/Module.h
+++ b/audio/aidl/default/include/core-impl/Module.h
@@ -60,7 +60,8 @@
std::unique_ptr<Configuration>&& config);
static std::optional<Type> typeFromString(const std::string& type);
- Module(Type type, std::unique_ptr<Configuration>&& config);
+ Module(Type type, std::unique_ptr<Configuration>&& config)
+ : mType(type), mConfig(std::move(config)) {}
protected:
// The vendor extension done via inheritance can override interface methods and augment
@@ -234,7 +235,6 @@
const Streams& getStreams() const { return mStreams; }
Type getType() const { return mType; }
bool isMmapSupported();
- void populateConnectedProfiles();
template <typename C>
std::set<int32_t> portIdsFromPortConfigIds(C portConfigIds);
void registerPatch(const AudioPatch& patch);