Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 174e8cb3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Align AIDL HAL config reporting with legacy" into main am: 141d6b83 am: 9f77b2cd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2694852



Change-Id: I8c45d3716cff989bec38a36d5dab9d75ceb81e1a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c5b7a14 9f77b2cd

media/libaudiohal/impl/DevicesFactoryHalAidl.cpp

+18 −0
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ 
 * limitations under the License.

 */



#include <algorithm>

#include <map>

#include <memory>

#include <string>



#define LOG_TAG "DevicesFactoryHalAidl"

//#define LOG_NDEBUG 0
@@ -75,6 +78,21 @@ status_t DevicesFactoryHalAidl::getDeviceNames(std::vector<std::string> *names) 
                if (strcmp(instance, "default") == 0) instance = "primary";

                static_cast<decltype(names)>(context)->push_back(instance);

            });

    std::sort(names->begin(), names->end(), [](const std::string& lhs,

                    const std::string& rhs) {

        // This order corresponds to the canonical order of modules as specified in

        // the reference 'audio_policy_configuration_7_0.xml' file.

        static const std::map<std::string, int> kPriorities{

            { "primary", 0 }, { "a2dp", 1 }, { "usb", 2 }, { "r_submix", 3 },

            { "bluetooth", 4 }, { "hearing_aid", 5 }, { "msd", 6 }, { "stub", 7 }

        };

        auto lhsIt = kPriorities.find(lhs);

        auto rhsIt = kPriorities.find(rhs);

        if (lhsIt != kPriorities.end() && rhsIt != kPriorities.end()) {

            return lhsIt->second < rhsIt->second;

        }

        return lhsIt != kPriorities.end();

    });

    return OK;

}

services/audiopolicy/common/managerdefinitions/src/AudioPolicyConfig.cpp

+6 −1
Original line number Diff line number Diff line
@@ -89,7 +89,12 @@ status_t aidl2legacy_AudioHwModule_HwModule(const media::AudioHwModule& aidl, 
        if (aidlPort.ext.getTag() == AudioPortExt::mix) {

            auto mixPort = sp<IOProfile>::make("", AUDIO_PORT_ROLE_NONE);

            RETURN_STATUS_IF_ERROR(mixPort->readFromParcelable(fwPort));

            auto& profiles = mixPort->getAudioProfiles();

            if (profiles.empty()) {

                profiles.add(AudioProfile::createFullDynamic(gDynamicFormat));

            } else {

                sortAudioProfiles(mixPort->getAudioProfiles());

            }

            mixPorts.add(mixPort);

            ports.emplace(aidlPort.id, mixPort);

        } else if (aidlPort.ext.getTag() == AudioPortExt::device) {