summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXpLoDWilD <xplodgui@gmail.com>2012-06-16 23:16:35 +0200
committerXpLoDWilD <xplodgui@gmail.com>2012-06-16 23:16:35 +0200
commit1fed5ff545b2fc3313f4774ec5e417554573962f (patch)
tree7adf8eaf693fbf34c6ce1c855d344275ff383151
parente8f81b6fcb954f9c56e8ff3a93b10b4eb6eac3f9 (diff)
downloaddevice_samsung_i9300-1fed5ff545b2fc3313f4774ec5e417554573962f.zip
device_samsung_i9300-1fed5ff545b2fc3313f4774ec5e417554573962f.tar.gz
device_samsung_i9300-1fed5ff545b2fc3313f4774ec5e417554573962f.tar.bz2
Do not cancel autofocus!
-rw-r--r--camerawrapper/CameraWrapper.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/camerawrapper/CameraWrapper.cpp b/camerawrapper/CameraWrapper.cpp
index ddbae38..9550137 100644
--- a/camerawrapper/CameraWrapper.cpp
+++ b/camerawrapper/CameraWrapper.cpp
@@ -298,8 +298,11 @@ int camera_cancel_auto_focus(struct camera_device * device)
if(!device)
return -EINVAL;
-
- return VENDOR_CALL(device, cancel_auto_focus);
+ // Samsung camera HAL restarts focus (CAF_RESTART) when we cancel auto focus.
+ // Cancel auto focus is called just before pic is taken in autofocus mode, thus
+ // the HAL crashes.
+ return 0;
+ //return VENDOR_CALL(device, cancel_auto_focus);
}
int camera_take_picture(struct camera_device * device)