summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2014-06-05 12:03:56 -0700
committerChong Zhang <chz@google.com>2014-06-06 13:20:52 -0700
commit1cfe8ce28eafd5ff758adbb73bfb257503d7704b (patch)
tree428175aa97ff5bcca5d867e9b5bb4cb931f61902
parentf7ceda1957d83f41f9af6c1991ee4cb767574349 (diff)
downloadframeworks_av-1cfe8ce28eafd5ff758adbb73bfb257503d7704b.zip
frameworks_av-1cfe8ce28eafd5ff758adbb73bfb257503d7704b.tar.gz
frameworks_av-1cfe8ce28eafd5ff758adbb73bfb257503d7704b.tar.bz2
check camera permission for video source other than SURFACE
Bug: 15448704 Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
-rw-r--r--media/libmediaplayerservice/MediaRecorderClient.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp
index a9820e0..194abbb 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.cpp
+++ b/media/libmediaplayerservice/MediaRecorderClient.cpp
@@ -95,7 +95,8 @@ status_t MediaRecorderClient::setPreviewSurface(const sp<IGraphicBufferProducer>
status_t MediaRecorderClient::setVideoSource(int vs)
{
ALOGV("setVideoSource(%d)", vs);
- if (!checkPermission(cameraPermission)) {
+ // Check camera permission for sources other than SURFACE
+ if (vs != VIDEO_SOURCE_SURFACE && !checkPermission(cameraPermission)) {
return PERMISSION_DENIED;
}
Mutex::Autolock lock(mLock);