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
commita8e409f8f9b40737d0b03355894b5e141d0aff6b (patch)
tree8799a5eecc61038ccf054d905ca3f4492ae18f30 /services/camera
parent77d2e08add3ba24fdc527809408028efe3e06b6b (diff)
downloadframeworks_av-a8e409f8f9b40737d0b03355894b5e141d0aff6b.zip
frameworks_av-a8e409f8f9b40737d0b03355894b5e141d0aff6b.tar.gz
frameworks_av-a8e409f8f9b40737d0b03355894b5e141d0aff6b.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"