OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f7ceda1
)
check camera permission for video source other than SURFACE
author
Chong Zhang
<chz@google.com>
Thu, 5 Jun 2014 19:03:56 +0000
(12:03 -0700)
committer
Chong Zhang
<chz@google.com>
Fri, 6 Jun 2014 20:20:52 +0000
(13:20 -0700)
Bug:
15448704
Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
media/libmediaplayerservice/MediaRecorderClient.cpp
patch
|
blob
|
history
diff --git
a/media/libmediaplayerservice/MediaRecorderClient.cpp
b/media/libmediaplayerservice/MediaRecorderClient.cpp
index
a9820e0
..
194abbb
100644
(file)
--- 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);