diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-20 22:44:17 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-20 22:44:17 -0700 |
| commit | 41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e (patch) | |
| tree | b07791052009a5ae3502317f85d8d8748016749a /media/libmediaplayerservice/MediaRecorderClient.cpp | |
| parent | 7562408b2261d38415453378b6188f74fda99d88 (diff) | |
| parent | 44722c6dc80b0bc3710f6a7fea31440988e8e3b6 (diff) | |
| download | frameworks_av-41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e.zip frameworks_av-41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e.tar.gz frameworks_av-41d23d53e34eaa3c4928ec4a1c7d4a968c3c596e.tar.bz2 | |
am c1c82509: Merge change 2163 into donut
Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'
* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
Diffstat (limited to 'media/libmediaplayerservice/MediaRecorderClient.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index 24f3628..e54f20d 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -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"); |