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

Commit 79fdb177 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audiopolicy: Avoid logspam about engine config parsing error" am: 45b37541 am: 52ba0c5f 

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

Change-Id: Ic49ab16dd8c7a0689a719b313c0814c270d70a28
parents 26385378 52ba0c5f

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

+8 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#define LOG_TAG "APM::AudioPolicyEngine/Base"

//#define LOG_NDEBUG 0



#include <sys/stat.h>



#include "EngineBase.h"

#include "EngineDefaultConfig.h"

#include <TypeConverter.h>
@@ -147,8 +149,13 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig() 
        });

        return iter != end(volumeGroups);

    };

    auto fileExists = [](const char* path) {

        struct stat fileStat;

        return stat(path, &fileStat) == 0 && S_ISREG(fileStat.st_mode);

    };



    auto result = engineConfig::parse();

    auto result = fileExists(engineConfig::DEFAULT_PATH) ?

            engineConfig::parse(engineConfig::DEFAULT_PATH) : engineConfig::ParsingResult{};

    if (result.parsedConfig == nullptr) {

        ALOGW("%s: No configuration found, using default matching phone experience.", __FUNCTION__);

        engineConfig::Config config = gDefaultEngineConfig;