summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2013-07-09 08:00:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-09 08:00:35 -0700
commitadaa78c901a2f2509965b7acc1cde848dfc6bafe (patch)
tree130ea2f4111654771de0807a0ffd2fda5ba92365
parent06a4604e77b5872857ef95fe712b6ce00c7aa506 (diff)
parenta2520db02bead68d4980783c41500ae96511bdf8 (diff)
downloadframeworks_av-adaa78c901a2f2509965b7acc1cde848dfc6bafe.zip
frameworks_av-adaa78c901a2f2509965b7acc1cde848dfc6bafe.tar.gz
frameworks_av-adaa78c901a2f2509965b7acc1cde848dfc6bafe.tar.bz2
am a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit 'a2520db02bead68d4980783c41500ae96511bdf8': camera2/3: set preview callback oneshot flag during still capture
-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 16688cf..6942006 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -616,6 +616,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: