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

Commit 3fd544e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use PermissionChecker (av) in captureAudioOutputAllowed method" into tm-dev am: 981bf0e8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18672350



Change-Id: Ifb19acde76681cf3b05f47d7b8f0f12d34da8dab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 548851f3 981bf0e8

media/utils/ServiceUtilities.cpp

+6 −2
Original line number Diff line number Diff line
@@ -181,10 +181,14 @@ void finishRecording(const AttributionSourceState& attributionSource, audio_sour 


bool captureAudioOutputAllowed(const AttributionSourceState& attributionSource) {

    uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));

    pid_t pid = VALUE_OR_FATAL(aidl2legacy_int32_t_pid_t(attributionSource.pid));

    if (isAudioServerOrRootUid(uid)) return true;

    static const String16 sCaptureAudioOutput("android.permission.CAPTURE_AUDIO_OUTPUT");

    bool ok = PermissionCache::checkPermission(sCaptureAudioOutput, pid, uid);

    // Use PermissionChecker, which includes some logic for allowing the isolated

    // HotwordDetectionService to hold certain permissions.

    permission::PermissionChecker permissionChecker;

    bool ok = (permissionChecker.checkPermissionForPreflight(

            sCaptureAudioOutput, attributionSource, String16(),

            AppOpsManager::OP_NONE) != permission::PermissionChecker::PERMISSION_HARD_DENIED);

    if (!ok) ALOGV("Request requires android.permission.CAPTURE_AUDIO_OUTPUT");

    return ok;

}