commit f1273c07a7b718504c1d0bbff5bcea4ef0379c38
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 03 17:28:27 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 03 17:28:27 2019 +0000
tree 5f9bee88cee4b88f593bef847003c2033e48a79b
parent 66abdd2ff0de06c87a54e059c37147f4c6f486f8
parent 7795e4a3fda5623acbb8dd985150207642059218

Merge "Audio Policy: Do not stop getOutputForAttr on invalid Mix"

services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
index 8f15016..1b812c0 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
@@ -147,7 +147,10 @@
         }
 
         switch (mixMatch(policyMix.get(), i, attributes, uid)) {
-            case MixMatchStatus::INVALID_MIX: return BAD_VALUE; // TODO: Do we really want to abort?
+            case MixMatchStatus::INVALID_MIX:
+                // The mix has contradictory rules, ignore it
+                // TODO: reject invalid mix at registration
+                continue;
             case MixMatchStatus::NO_MATCH:
                 ALOGV("%s: Mix %zu: does not match", __func__, i);
                 continue; // skip the mix