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

Commit 183baba8 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am c1c82509: Merge change 2163 into donut 

Merge commit 'c1c82509'

* commit 'c1c82509':
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
parents 931eb395 c1c82509

media/libmediaplayerservice/MediaRecorderClient.cpp

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
namespace android {



const char* cameraPermission = "android.permission.CAMERA";

const char* recordAudioPermission = "android.permission.RECORD_AUDIO";



static bool checkPermission(const char* permissionString) {

#ifndef HAVE_ANDROID_OS
@@ -86,6 +87,9 @@ status_t MediaRecorderClient::setVideoSource(int vs) 
status_t MediaRecorderClient::setAudioSource(int as)

{

    LOGV("setAudioSource(%d)", as);

    if (!checkPermission(recordAudioPermission)) {

        return PERMISSION_DENIED;

    }

    Mutex::Autolock lock(mLock);

    if (mRecorder == NULL)  {

        LOGE("recorder is not initialized");