summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorTyler Luu <tluu@ti.com>2011-11-21 16:29:09 -0600
committerIliyan Malchev <malchev@google.com>2012-02-01 14:47:16 -0800
commita6e104aadf560de4e33291c8e85f79acc8fb46c9 (patch)
tree42d0b885061cd5bfb931fcaa34c8c76d2e97c748 /camera
parent6dfa24e225e7549675c0041611c114eb0b3b734d (diff)
downloadhardware_ti_omap4xxx-a6e104aadf560de4e33291c8e85f79acc8fb46c9.zip
hardware_ti_omap4xxx-a6e104aadf560de4e33291c8e85f79acc8fb46c9.tar.gz
hardware_ti_omap4xxx-a6e104aadf560de4e33291c8e85f79acc8fb46c9.tar.bz2
CameraHal: Fix timing issue with focus msg disable
Disable focus message before sending notification because client can immediately call focus again after receiving notification and before we get a chance to disable the message. This will result in the focus notificiation for the subsequent focus call to be missed. Change-Id: I1367cdcebe490c32251e992b87ada3edf6b28036 Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera')
-rw-r--r--camera/AppCallbackNotifier.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index 18f48f3..58cb9a7 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -360,16 +360,16 @@ void AppCallbackNotifier::notifyEvent()
( NULL != mNotifyCb ) &&
( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS) ) )
{
- mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie);
mCameraHal->disableMsgType(CAMERA_MSG_FOCUS);
+ mNotifyCb(CAMERA_MSG_FOCUS, true, 0, mCallbackCookie);
}
else if ( focusEvtData->focusError &&
( NULL != mCameraHal ) &&
( NULL != mNotifyCb ) &&
( mCameraHal->msgTypeEnabled(CAMERA_MSG_FOCUS) ) )
{
- mNotifyCb(CAMERA_MSG_FOCUS, false, 0, mCallbackCookie);
mCameraHal->disableMsgType(CAMERA_MSG_FOCUS);
+ mNotifyCb(CAMERA_MSG_FOCUS, false, 0, mCallbackCookie);
}
break;