From 31b699051e9f59824dbf7c8afff231c65303261b Mon Sep 17 00:00:00 2001 From: jhenrique09 Date: Tue, 24 Mar 2020 16:36:07 -0300 Subject: [PATCH] av: Remove restrictions for system audio record * Give freedom to screen recorder apps Change-Id: I726bde4f44bba6fc8cd771ae90c8864b26cdd919 Signed-off-by: Pranav Vashi --- .../libaaudio/src/utility/AAudioUtilities.cpp | 4 ++-- .../managerdefinitions/src/AudioPolicyMix.cpp | 24 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/media/libaaudio/src/utility/AAudioUtilities.cpp b/media/libaaudio/src/utility/AAudioUtilities.cpp index 3df23eeb15..164e1715da 100644 --- a/media/libaaudio/src/utility/AAudioUtilities.cpp +++ b/media/libaaudio/src/utility/AAudioUtilities.cpp @@ -261,7 +261,7 @@ audio_flags_mask_t AAudio_computeAudioFlagsMask( bool isContentSpatialized, audio_output_flags_t outputFlags) { audio_flags_mask_t flagsMask = AUDIO_FLAG_NONE; - switch (policy) { + /*switch (policy) { case AAUDIO_UNSPECIFIED: case AAUDIO_ALLOW_CAPTURE_BY_ALL: // flagsMask is not modified @@ -276,7 +276,7 @@ audio_flags_mask_t AAudio_computeAudioFlagsMask( default: ALOGE("%s() 0x%08X unrecognized capture policy", __func__, policy); // flagsMask is not modified - } + }*/ switch (spatializationBehavior) { case AAUDIO_UNSPECIFIED: diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp index 3430f4bb01..0d863f1f2e 100644 --- a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp +++ b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp @@ -426,30 +426,6 @@ bool AudioPolicyMixCollection::mixMatch(const AudioMix* mix, size_t mixIndex, uid_t uid, audio_session_t session) { if (mix->mMixType == MIX_TYPE_PLAYERS) { - // Loopback render mixes are created from a public API and thus restricted - // to non sensible audio that have not opted out. - if (is_mix_loopback_render(mix->mRouteFlags)) { - if (!(attributes.usage == AUDIO_USAGE_UNKNOWN || - attributes.usage == AUDIO_USAGE_MEDIA || - attributes.usage == AUDIO_USAGE_GAME || - attributes.usage == AUDIO_USAGE_VOICE_COMMUNICATION)) { - return false; - } - auto hasFlag = [](auto flags, auto flag) { return (flags & flag) == flag; }; - if (hasFlag(attributes.flags, AUDIO_FLAG_NO_SYSTEM_CAPTURE)) { - return false; - } - - if (attributes.usage == AUDIO_USAGE_VOICE_COMMUNICATION) { - if (!mix->mVoiceCommunicationCaptureAllowed) { - return false; - } - } else if (!mix->mAllowPrivilegedMediaPlaybackCapture && - hasFlag(attributes.flags, AUDIO_FLAG_NO_MEDIA_PROJECTION)) { - return false; - } - } - // Permit match only if requested format and mix format are PCM and can be format // adapted by the mixer, or are the same (compressed) format. if (!is_mix_loopback(mix->mRouteFlags) &&