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

Commit 3158c937 authored by jiabin's avatar jiabin
Browse files

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

Test: atest AudioPlaybackCaptureTest
Bug: 148559127
Change-Id: Ifaa00797ccc9deb9371ef949fcdb8b6723e5e28d
parent a170e61f

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

+3 −3
Original line number Diff line number Diff line
@@ -353,11 +353,11 @@ AudioPolicyMixCollection::MixMatchStatus AudioPolicyMixCollection::mixMatch( 
        // 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;

        }