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

Commit 8d3ae49b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audiopolicy: capengine: fix missing comma when chaining compound rules"... 

Merge "audiopolicy: capengine: fix missing comma when chaining compound rules" into main am: a660a45f

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



Change-Id: I3632ab5ea28d9ef70502400805330711d66fd702
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f20335b1 a660a45f

services/audiopolicy/engineconfigurable/config/src/CapEngineConfig.cpp

+6 −5
Original line number Diff line number Diff line
@@ -316,13 +316,14 @@ ConversionResult<std::string> aidl2legacy_AudioHalCapRule_CapRule( 
    }

    rule += "{";

    if (!aidlRule.nestedRules.empty()) {

        for (const auto& nestedRule: aidlRule.nestedRules) {

            rule += VALUE_OR_FATAL(aidl2legacy_AudioHalCapRule_CapRule(nestedRule));

        }

        if (!aidlRule.criterionRules.empty()) {

        for (auto ruleIter = aidlRule.nestedRules.begin(); ruleIter != aidlRule.nestedRules.end();

                ++ruleIter) {

            rule += VALUE_OR_FATAL(aidl2legacy_AudioHalCapRule_CapRule(*ruleIter));

            if (ruleIter != (aidlRule.nestedRules.end()  - 1) || !aidlRule.criterionRules.empty()) {

                rule += ",";

            }

        }

    }

    bool isFirstCriterionRule = true;

    for (const auto& criterionRule: aidlRule.criterionRules) {

        if (!isFirstCriterionRule) {