commit 04e4465aa7b58c07c4a278b9ddc2731b20b645ad
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 04 22:16:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 22:16:14 2020 +0000
tree 5202d0fa3374dfe9a2cc677044f2de6599e89fd4
parent b5c0071bb7a1c6524deb42ac6643d8fae3106248
parent 3158c93704e0574c31eed69aff4a5259acfb267d

Merge "User id match rule should be applied when doing mix matching."

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 11660f0..bf1a34f 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp
@@ -353,11 +353,11 @@
         // determine if exiting on success (or implicit failure as desc is 0)
         if (hasAddrMatch ||
                 !((hasUsageExcludeRules && usageExclusionFound) ||
-                  (hasUserIdExcludeRules && userIdExclusionFound) ||
                   (hasUsageMatchRules && !usageMatchFound)  ||
                   (hasUidExcludeRules && uidExclusionFound) ||
-                  (hasUidMatchRules && !uidMatchFound)) ||
-                  (hasUserIdMatchRules && !userIdMatchFound)) {
+                  (hasUidMatchRules && !uidMatchFound) ||
+                  (hasUserIdExcludeRules && userIdExclusionFound) ||
+                  (hasUserIdMatchRules && !userIdMatchFound))) {
             ALOGV("\tgetOutputForAttr will use mix %zu", mixIndex);
             return MixMatchStatus::MATCH;
         }