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

Commit ee9b3db9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio policy: fix capture policy for assistant when running as top" into main

parents cde37441 73efbca9

services/audiopolicy/service/AudioPolicyService.cpp

+4 −1
Original line number Diff line number Diff line
@@ -1041,6 +1041,9 @@ void AudioPolicyService::updateUidStates_l() 
            current->attributionSource.uid == topSensitiveActive->attributionSource.uid;

        bool isTopOrLatestAssistant = latestActiveAssistant == nullptr ? false :

            current->attributionSource.uid == latestActiveAssistant->attributionSource.uid;

        bool isActiveAssistant =

                (useActiveAssistantList && mUidPolicy->isActiveAssistantUid(currentUid))

                    || mUidPolicy->isAssistantUid(currentUid);



        // TODO: b/339112720

        // Refine this logic when we have the correct phone state owner UID. The current issue is
@@ -1069,7 +1072,7 @@ void AudioPolicyService::updateUidStates_l() 
        const bool allowSensitiveCapture =

            !isSensitiveActive || isTopOrLatestSensitive || current->canCaptureOutput;

        bool allowCapture = false;

        if (!isAssistantOnTop) {

        if (!isAssistantOnTop || isActiveAssistant) {

            allowCapture = (isTopOrLatestActive || isTopOrLatestSensitive) &&

                           allowSensitiveCapture && canCaptureIfInCallOrCommunication;

        } else {