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

Commit 4ab1841a authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: fix privacy sensitive capture by assistants 

Fix a bug in AudioPolicyService::updateUidStates_l() preventing
an app in assistant role from capturing with privacy sensitive
flag set.

Bug: 257097078
Test: make
Change-Id: I3d99e386c6826c69161e04628d0ce2c07069b210
parent 617020a0

services/audiopolicy/service/AudioPolicyService.cpp

+6 −5
Original line number Diff line number Diff line
@@ -1006,10 +1006,11 @@ void AudioPolicyService::updateUidStates_l() 
        //     AND is on TOP or latest started

        //     AND there is no active privacy sensitive capture or call

        //             OR client has CAPTURE_AUDIO_OUTPUT privileged permission

        bool allowSensitiveCapture =

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

        bool allowCapture = !isAssistantOnTop

                && (isTopOrLatestActive || isTopOrLatestSensitive)

                && !(isSensitiveActive

                    && !(isTopOrLatestSensitive || current->canCaptureOutput))

                && allowSensitiveCapture

                && canCaptureIfInCallOrCommunication(current);



        if (!current->hasOp()) {
@@ -1032,7 +1033,7 @@ void AudioPolicyService::updateUidStates_l() 
                if (source == AUDIO_SOURCE_HOTWORD || source == AUDIO_SOURCE_VOICE_RECOGNITION) {

                    allowCapture = true;

                }

            } else if (!(isSensitiveActive && !current->canCaptureOutput)

            } else if (allowSensitiveCapture

                    && canCaptureIfInCallOrCommunication(current)) {

                if (isTopOrLatestAssistant

                    && (source == AUDIO_SOURCE_VOICE_RECOGNITION
@@ -1053,7 +1054,7 @@ void AudioPolicyService::updateUidStates_l() 
                if (source == AUDIO_SOURCE_HOTWORD || source == AUDIO_SOURCE_VOICE_RECOGNITION) {

                    allowCapture = true;

                }

            } else if (!(isSensitiveActive && !current->canCaptureOutput)

            } else if (allowSensitiveCapture

                        && canCaptureIfInCallOrCommunication(current)) {

                if ((source == AUDIO_SOURCE_VOICE_RECOGNITION) || (source == AUDIO_SOURCE_HOTWORD))

                {
@@ -1068,7 +1069,7 @@ void AudioPolicyService::updateUidStates_l() 
            //     OR

            //         Is on TOP AND the source is VOICE_RECOGNITION or HOTWORD

            if (!isAssistantOnTop

                    && !(isSensitiveActive && !current->canCaptureOutput)

                    && allowSensitiveCapture

                    && canCaptureIfInCallOrCommunication(current)) {

                allowCapture = true;

            }