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

Commit a60d5842 authored by Oscar Azucena's avatar Oscar Azucena Committed by Gerrit Code Review
Browse files

Merge "Revert "audiopolicy: cap engine: fallback on default configuration"" into main

parents 5bc3afee eccd00f5

services/audiopolicy/engine/common/include/EngineBase.h

+0 −2
Original line number Diff line number Diff line
@@ -178,8 +178,6 @@ public: 


    void updateDeviceSelectionCache() override;



    void setDefaultConfiguration();



protected:

    DeviceVector getPreferredAvailableDevicesForProductStrategy(

        const DeviceVector& availableOutputDevices, product_strategy_t strategy) const;

services/audiopolicy/engine/common/src/EngineBase.cpp

+0 −6
Original line number Diff line number Diff line
@@ -125,12 +125,6 @@ std::string EngineBase::getProductStrategyName(product_strategy_t id) const { 
    return "";

}



void EngineBase::setDefaultConfiguration() {

    mProductStrategies.clear();

    mVolumeGroups.clear();

    (void) processParsingResult({std::make_unique<engineConfig::Config>(gDefaultEngineConfig), 1});

}



engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig(

        const media::audio::common::AudioHalEngineConfig& aidlConfig, bool)

{

services/audiopolicy/engineconfigurable/src/Engine.cpp

+6 −8
Original line number Diff line number Diff line
@@ -97,10 +97,9 @@ status_t Engine::loadFromHalConfigWithFallback( 
    };

    loadCriteria(capResult.parsedConfig->capCriteria);

    std::string error;

    if (mPolicyParameterMgr->start(error) != NO_ERROR) {

        ALOGE("%s: could not start Policy PFW: %s, fallback on default", __func__ , error.c_str());

        setDefaultConfiguration();

        return NO_ERROR;

    if (mPolicyParameterMgr == nullptr || mPolicyParameterMgr->start(error) != NO_ERROR) {

        ALOGE("%s: could not start Policy PFW: %s", __FUNCTION__, error.c_str());

        return NO_INIT;

    }

    return mPolicyParameterMgr->setConfiguration(capResult);

}
@@ -109,10 +108,9 @@ status_t Engine::loadFromXmlConfigWithFallback(const std::string& xmlFilePath) 
{

    status_t status = loadWithFallback(xmlFilePath);

    std::string error;

    if (mPolicyParameterMgr->start(error) != NO_ERROR) {

        ALOGE("%s: could not start Policy PFW: %s, fallback on default", __func__ , error.c_str());

        setDefaultConfiguration();

        return NO_ERROR;

    if (mPolicyParameterMgr == nullptr || mPolicyParameterMgr->start(error) != NO_ERROR) {

        ALOGE("%s: could not start Policy PFW: %s", __FUNCTION__, error.c_str());

        return NO_INIT;

    }

    return status;

}