commit 132a4fb88207075932d5dbb7970383ceb6405be7
author Zhijun He <zhijunhe@google.com> Thu Jul 11 01:54:37 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 11 01:54:37 2013 -0700
tree ec21c59b24e605c3cf3ea5e7aad2dfab0a662be8
parent b0dfd4613225a3b2a17bdf8d85e89a4b04d65ef3
parent adaa78c901a2f2509965b7acc1cde848dfc6bafe

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

services/camera/libcameraservice/Camera2Client.cpp

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 @@
         case Parameters::STOPPED:
         case Parameters::WAITING_FOR_PREVIEW_WINDOW:
         case Parameters::PREVIEW:
+        case Parameters::STILL_CAPTURE:
             // OK
             break;
         default: