From 1cfe8ce28eafd5ff758adbb73bfb257503d7704b Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Thu, 5 Jun 2014 12:03:56 -0700
Subject: check camera permission for video source other than SURFACE

Bug: 15448704
Change-Id: I5f5417037b877a6da3a46700ebb5a80ea59aac36
---
 media/libmediaplayerservice/MediaRecorderClient.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'media/libmediaplayerservice/MediaRecorderClient.cpp')

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);
-- 
cgit v1.1