Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI 149136: Restore RECORD_AUDIO permission check to MediaRecorder.

Browse Source 
When we moved the media recorder to the media server process, we lost
  the permission check that was done at the process boundary in the
  AudioRecord binder interface because the AudioRecord object is created
  in the same process. This change adds a permission check in the
  MediaRecorderClient:setAudioSource() method.
  BUG=1868334

Automated import of CL 149136
This commit is contained in:
Dave Sparks
2009-05-21 10:02:21 -07:00
committed by The Android Open Source Project
parent 7b7225c8fd
commit 4d8adefd35
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libmediaplayerservice/MediaRecorderClient.cpp
View File

@@ -37,6 +37,7 @@
namespace android { namespace android {
const char* cameraPermission = "android.permission.CAMERA"; const char* cameraPermission = "android.permission.CAMERA";
const char* recordAudioPermission = "android.permission.RECORD_AUDIO";
static bool checkPermission(const char* permissionString) { static bool checkPermission(const char* permissionString) {
#ifndef HAVE_ANDROID_OS #ifndef HAVE_ANDROID_OS
@@ -86,6 +87,9 @@ status_t MediaRecorderClient::setVideoSource(int vs)
status_t MediaRecorderClient::setAudioSource(int as) status_t MediaRecorderClient::setAudioSource(int as)
{ {
LOGV("setAudioSource(%d)", as); LOGV("setAudioSource(%d)", as);
if (!checkPermission(recordAudioPermission)) {
return PERMISSION_DENIED;
}
Mutex::Autolock lock(mLock); Mutex::Autolock lock(mLock);
if (mRecorder == NULL) { if (mRecorder == NULL) {
LOGE("recorder is not initialized"); LOGE("recorder is not initialized");