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

Commit 599ec462 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Svet Ganov
Browse files

Revert "Use start/finish app op API for mic use" 

This reverts commit 55bb217c.

Reason for revert: Causes a regression

bug:74061812

Change-Id: I119937cfce79ba824185634f2b81dad1606a875d
parent 9b887324

services/audioflinger/AudioFlinger.cpp

+0 −1
Original line number Diff line number Diff line
@@ -3051,7 +3051,6 @@ sp<IEffect> AudioFlinger::createEffect( 


        // check recording permission for visualizer

        if ((memcmp(&desc.type, SL_IID_VISUALIZATION, sizeof(effect_uuid_t)) == 0) &&

            // TODO: Do we need to start/stop op - i.e. is there recording being performed?

            !recordingAllowed(opPackageName, pid, IPCThreadState::self()->getCallingUid())) {

            lStatus = PERMISSION_DENIED;

            goto Exit;

services/audioflinger/ServiceUtilities.cpp

+43 −71
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 


namespace android {



static const String16 sAndroidPermissionRecordAudio("android.permission.RECORD_AUDIO");



// Not valid until initialized by AudioFlinger constructor.  It would have to be

// re-initialized if the process containing AudioFlinger service forks (which it doesn't).

// This is often used to validate binder interface calls within audioserver
@@ -51,72 +49,25 @@ bool isTrustedCallingUid(uid_t uid) { 
}



bool recordingAllowed(const String16& opPackageName, pid_t pid, uid_t uid) {

    return checkRecordingInternal(opPackageName, pid, uid, false);

}



bool startRecording(const String16& opPackageName, pid_t pid, uid_t uid) {

     return checkRecordingInternal(opPackageName, pid, uid, true);

}



bool checkRecordingInternal(const String16& opPackageName, pid_t pid, uid_t uid, bool start) {

    // we're always OK.

    if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;



     // To permit command-line native tests

     if (uid == AID_ROOT) return true;

    static const String16 sRecordAudio("android.permission.RECORD_AUDIO");



    // We specify a pid and uid here as mediaserver (aka MediaRecorder or StageFrightRecorder)

    // may open a record track on behalf of a client.  Note that pid may be a tid.

     // IMPORTANT: DON'T USE PermissionCache - RUNTIME PERMISSIONS CHANGE.

     PermissionController permissionController;

     const bool ok = permissionController.checkPermission(sAndroidPermissionRecordAudio, pid, uid);

    // IMPORTANT: Don't use PermissionCache - a runtime permission and may change.

    const bool ok = checkPermission(sRecordAudio, pid, uid);

    if (!ok) {

         ALOGE("Request requires %s", String8(sAndroidPermissionRecordAudio).c_str());

        ALOGE("Request requires android.permission.RECORD_AUDIO");

        return false;

    }



     const String16 resolvedOpPackageName = resolveCallingPackage(

             permissionController, opPackageName, uid);

     if (opPackageName.size() <= 0) {

         return false;

     }



     AppOpsManager appOps;

     const int32_t op = appOps.permissionToOpCode(sAndroidPermissionRecordAudio);

     if (start) {

         if (appOps.startOpNoThrow(op, uid, resolvedOpPackageName, /*startIfModeDefault*/ false)

                 != AppOpsManager::MODE_ALLOWED) {

             ALOGE("Request denied by app op: %d", op);

             return false;

         }

     } else {

         if (appOps.noteOp(op, uid, resolvedOpPackageName) != AppOpsManager::MODE_ALLOWED) {

             ALOGE("Request denied by app op: %d", op);

             return false;

         }

     }



     return true;

}



void finishRecording(const String16& opPackageName, uid_t uid) {

    PermissionController permissionController;

    const String16 resolvedOpPackageName = resolveCallingPackage(

            permissionController, opPackageName, uid);

    if (opPackageName.size() <= 0) {

        return;

    }

    // To permit command-line native tests

    if (uid == AID_ROOT) return true;



    AppOpsManager appOps;

    const int32_t op = appOps.permissionToOpCode(sAndroidPermissionRecordAudio);

    appOps.finishOp(op, uid, resolvedOpPackageName);

}

    String16 checkedOpPackageName = opPackageName;



const String16 resolveCallingPackage(PermissionController& permissionController,

        const String16& opPackageName, uid_t uid) {

    if (opPackageName.size() > 0) {

        return opPackageName;

    }

    // In some cases the calling code has no access to the package it runs under.

    // For example, code using the wilhelm framework's OpenSL-ES APIs. In this

    // case we will get the packages for the calling UID and pick the first one
@@ -124,19 +75,40 @@ const String16 resolveCallingPackage(PermissionController& permissionController, 
    // as for legacy apps we will toggle the app op for all packages in the UID.

    // The caveat is that the operation may be attributed to the wrong package and

    // stats based on app ops may be slightly off.

    if (checkedOpPackageName.size() <= 0) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder = sm->getService(String16("permission"));

        if (binder == 0) {

            ALOGE("Cannot get permission service");

            return false;

        }



        sp<IPermissionController> permCtrl = interface_cast<IPermissionController>(binder);

        Vector<String16> packages;

    permissionController.getPackagesForUid(uid, packages);



        permCtrl->getPackagesForUid(uid, packages);



        if (packages.isEmpty()) {

        ALOGE("No packages for uid %d", uid);

        return opPackageName;

            ALOGE("No packages for calling UID");

            return false;

        }

        checkedOpPackageName = packages[0];

    }



    AppOpsManager appOps;

    if (appOps.noteOp(AppOpsManager::OP_RECORD_AUDIO, uid, checkedOpPackageName)

            != AppOpsManager::MODE_ALLOWED) {

        ALOGE("Request denied by app op OP_RECORD_AUDIO");

        return false;

    }

    return packages[0];



    return true;

}



bool captureAudioOutputAllowed(pid_t pid, uid_t uid) {

    if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;

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

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

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

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

    return ok;

}
@@ -183,7 +155,7 @@ bool dumpAllowed() { 


bool modifyPhoneStateAllowed(pid_t pid, uid_t uid) {

    static const String16 sModifyPhoneState("android.permission.MODIFY_PHONE_STATE");

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

    bool ok = checkPermission(sModifyPhoneState, pid, uid);

    if (!ok) ALOGE("Request requires android.permission.MODIFY_PHONE_STATE");

    return ok;

}

services/audioflinger/ServiceUtilities.h

+0 −8
Original line number Diff line number Diff line
@@ -16,19 +16,11 @@ 


#include <unistd.h>



#include <binder/PermissionController.h>



namespace android {



extern pid_t getpid_cached;

bool isTrustedCallingUid(uid_t uid);

bool recordingAllowed(const String16& opPackageName, pid_t pid, uid_t uid);

bool startRecording(const String16& opPackageName, pid_t pid, uid_t uid);

void finishRecording(const String16& opPackageName, uid_t uid);

// DON'T USE THIS INTERNAL METHOD

bool checkRecordingInternal(const String16& opPackageName, pid_t pid, uid_t uid, bool start);

const String16 resolveCallingPackage(PermissionController& permissionController,

        const String16& opPackageName, uid_t uid);

bool captureAudioOutputAllowed(pid_t pid, uid_t uid);

bool captureHotwordAllowed(pid_t pid, uid_t uid);

bool settingsAllowed();

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+1 −4
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ status_t AudioPolicyService::startInput(audio_port_handle_t portId, bool *silenc 
    }



    // check calling permissions

    if (!startRecording(client->opPackageName, client->pid, client->uid)) {

    if (!recordingAllowed(client->opPackageName, client->pid, client->uid)) {

        ALOGE("%s permission denied: recording not allowed for uid %d pid %d",

                __func__, client->uid, client->pid);

        return PERMISSION_DENIED;
@@ -457,9 +457,6 @@ status_t AudioPolicyService::stopInput(audio_port_handle_t portId) 
    }

    sp<AudioRecordClient> client = mAudioRecordClients.valueAt(index);



    // finish the recording app op

    finishRecording(client->opPackageName, client->uid);



    return mAudioPolicyManager->stopInput(client->input, client->session);

}