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

Commit a660a45f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents d14fcb6b 4c2948bc
Loading
Loading
Loading
Loading
+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) {