summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-08-30 21:33:10 +0800
committerWu-cheng Li <wuchengli@google.com>2011-09-01 13:37:14 +0800
commit98bb251c8b527600e7a4cca6cc33499710bbfbf1 (patch)
tree76188de45f4b4fc862f7527e2eddc14c8bc38e27 /services/camera
parentabf82f9ea4960ead8716b183aac1792820cccdd1 (diff)
downloadframeworks_base-98bb251c8b527600e7a4cca6cc33499710bbfbf1.zip
frameworks_base-98bb251c8b527600e7a4cca6cc33499710bbfbf1.tar.gz
frameworks_base-98bb251c8b527600e7a4cca6cc33499710bbfbf1.tar.bz2
Add video snapshot camera parameter.
The API is still hidden. bug:5187868 Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index e193be0..b178fd9 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -769,11 +769,6 @@ status_t CameraService::Client::takePicture(int msgType) {
status_t result = checkPidAndHardware();
if (result != NO_ERROR) return result;
- if (mHardware->recordingEnabled()) {
- LOGE("Cannot take picture during recording.");
- return INVALID_OPERATION;
- }
-
if ((msgType & CAMERA_MSG_RAW_IMAGE) &&
(msgType & CAMERA_MSG_RAW_IMAGE_NOTIFY)) {
LOGE("CAMERA_MSG_RAW_IMAGE and CAMERA_MSG_RAW_IMAGE_NOTIFY"