summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-07-11 01:54:37 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-11 01:54:37 -0700
commit132a4fb88207075932d5dbb7970383ceb6405be7 (patch)
treeec21c59b24e605c3cf3ea5e7aad2dfab0a662be8 /services
parentb0dfd4613225a3b2a17bdf8d85e89a4b04d65ef3 (diff)
parentadaa78c901a2f2509965b7acc1cde848dfc6bafe (diff)
downloadframeworks_av-132a4fb88207075932d5dbb7970383ceb6405be7.zip
frameworks_av-132a4fb88207075932d5dbb7970383ceb6405be7.tar.gz
frameworks_av-132a4fb88207075932d5dbb7970383ceb6405be7.tar.bz2
am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit 'adaa78c901a2f2509965b7acc1cde848dfc6bafe': camera2/3: set preview callback oneshot flag during still capture
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/Camera2Client.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 96bde90..203d7c0 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -600,6 +600,7 @@ void Camera2Client::setPreviewCallbackFlagL(Parameters &params, int flag) {
case Parameters::STOPPED:
case Parameters::WAITING_FOR_PREVIEW_WINDOW:
case Parameters::PREVIEW:
+ case Parameters::STILL_CAPTURE:
// OK
break;
default: