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

Commit 1c0a9fb4 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "PFW: support to load the config policy from vendor partition"

parents fe0dee1e c41dc110

services/audiopolicy/engineconfigurable/wrapper/ParameterManagerWrapper.cpp

+7 −1
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ namespace audio_policy { 


const char *const ParameterManagerWrapper::mPolicyPfwDefaultConfFileName =

    "/etc/parameter-framework/ParameterFrameworkConfigurationPolicy.xml";

const char *const ParameterManagerWrapper::mPolicyPfwVendorConfFileName =

    "/vendor/etc/parameter-framework/ParameterFrameworkConfigurationPolicy.xml";



static const char *const gInputDeviceCriterionName = "AvailableInputDevices";

static const char *const gOutputDeviceCriterionName = "AvailableOutputDevices";
@@ -96,7 +98,11 @@ ParameterManagerWrapper::ParameterManagerWrapper() 
    : mPfwConnectorLogger(new ParameterMgrPlatformConnectorLogger)

{

    // Connector

    if (access(mPolicyPfwVendorConfFileName, R_OK) == 0) {

        mPfwConnector = new CParameterMgrPlatformConnector(mPolicyPfwVendorConfFileName);

    } else {

        mPfwConnector = new CParameterMgrPlatformConnector(mPolicyPfwDefaultConfFileName);

    }



    // Logger

    mPfwConnector->setLogger(mPfwConnectorLogger);

services/audiopolicy/engineconfigurable/wrapper/include/ParameterManagerWrapper.h

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ private: 
    struct parameterManagerElementSupported;



    static const char *const mPolicyPfwDefaultConfFileName; /**< Default Policy PFW top file name.*/

    static const char *const mPolicyPfwVendorConfFileName; /**< Vendor Policy PFW top file name.*/

};



} // namespace audio_policy