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 | 183baba8d12e5863bd1549e06e6da8a918f65fd0 (patch) | |
| tree | 7d923fc10133f35b87ba61d94a02b8864b090d06 /media | |
| parent | 931eb395528ab2c392d4316071dea5c7fd4b3f60 (diff) | |
| parent | c1c82509fb78403a969040cf057a66cbe3bfa538 (diff) | |
| download | frameworks_base-183baba8d12e5863bd1549e06e6da8a918f65fd0.zip frameworks_base-183baba8d12e5863bd1549e06e6da8a918f65fd0.tar.gz frameworks_base-183baba8d12e5863bd1549e06e6da8a918f65fd0.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')
| -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"); |