summaryrefslogtreecommitdiff
authorjiyu.yang <jiyu.yang@amlogic.com>2013-03-19 02:19:03 (GMT)
committer brian.zhu <brian.zhu@amlogic.com>2013-03-22 08:40:58 (GMT)
commit323ccec3a4700ff973385a75184168a605df59cc (patch)
tree73dd006b3c8c6775bfe4bae943a761f9260bcca4
parent3868d00113961c65c73c65ba6340376a09e9bd6a (diff)
downloadcamera-323ccec3a4700ff973385a75184168a605df59cc.zip
camera-323ccec3a4700ff973385a75184168a605df59cc.tar.gz
camera-323ccec3a4700ff973385a75184168a605df59cc.tar.bz2
PD #70289: fix focusing bug when photoing under NONBLOCK
fix camera apk exit unexpectedly when focusing at the same time take a picture under NONBLOCK mode
Diffstat
-rwxr-xr-xBaseCameraAdapter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/BaseCameraAdapter.cpp b/BaseCameraAdapter.cpp
index a11c04b..8558ff8 100755
--- a/BaseCameraAdapter.cpp
+++ b/BaseCameraAdapter.cpp
@@ -1942,6 +1942,8 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
switch ( operation )
{
+ case CAMERA_CANCEL_AUTOFOCUS:
+ CAMHAL_LOGDA("bad situation!!\n");
case CAMERA_STOP_IMAGE_CAPTURE:
case CAMERA_STOP_BRACKET_CAPTURE:
CAMHAL_LOGDB("Adapter state switch CAPTURE_STATE->PREVIEW_STATE event = 0x%x",
@@ -1992,6 +1994,8 @@ status_t BaseCameraAdapter::setState(CameraCommands operation)
switch ( operation )
{
+ case CAMERA_QUERY_BUFFER_SIZE_IMAGE_CAPTURE:
+ CAMHAL_LOGDA("bad situation!!\n");
case CAMERA_CANCEL_AUTOFOCUS:
CAMHAL_LOGDB("Adapter state switch AF_STATE->PREVIEW_STATE event = 0x%x",
operation);