commit 27934bfcebb2999517fc5d519be9748cc0162177
author The Android Automerger <android-build@android.com> Mon May 07 07:03:00 2012 -0700
committer The Android Automerger <android-build@android.com> Mon May 07 07:03:00 2012 -0700
tree 4ce2447b61a8e5010baa0bb5d837161435bdedef
parent d8bf3dc07ef357eb0761cfdacab458f2358907aa
parent 2f683f44dc1917987c9e5bb5e2a87b1f992ee3d6

merge in jb-release history after reset to jb-dev

camera/OMXCameraAdapter/OMXCameraAdapter.cpp

diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index a41327c..b3fcf67 100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -2968,6 +2968,7 @@
                 {
                 ancillaryData = (OMX_TI_ANCILLARYDATATYPE*) extraData->data;
                 snapshotFrame = ancillaryData->nDCCStatus;
+                mPending3Asettings |= SetFocus;
                 }
             }
 

camera/OMXCameraAdapter/OMXFocus.cpp

diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp
index 50e2c21..be1dfc5 100644
--- a/camera/OMXCameraAdapter/OMXFocus.cpp
+++ b/camera/OMXCameraAdapter/OMXFocus.cpp
@@ -148,9 +148,10 @@
         }
     }
 
-    if ( (focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto
-            && (focusStatus.eFocusStatus == OMX_FocusStatusRequest
-             || focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach) ) ||
+    if ( (focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto &&
+         ( focusStatus.eFocusStatus == OMX_FocusStatusRequest ||
+           focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach ||
+           focusStatus.eFocusStatus == OMX_FocusStatusLost ) ) ||
             (mParameters3A.Focus !=  (OMX_IMAGE_FOCUSCONTROLTYPE)OMX_IMAGE_FocusControlAuto) )
         {
         OMX_INIT_STRUCT_PTR (&bOMX, OMX_CONFIG_BOOLEANTYPE);
@@ -163,11 +164,11 @@
 
         // force AF, Ducati will take care of whether CAF
         // or AF will be performed, depending on light conditions
-        if ( focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto
-		&& focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach )
-			{
-			focusControl.eFocusControl = OMX_IMAGE_FocusControlAutoLock;
-			}
+        if ( focusControl.eFocusControl == OMX_IMAGE_FocusControlAuto &&
+             ( focusStatus.eFocusStatus == OMX_FocusStatusUnableToReach ||
+               focusStatus.eFocusStatus == OMX_FocusStatusLost ) ) {
+            focusControl.eFocusControl = OMX_IMAGE_FocusControlAutoLock;
+        }
 
         if ( focusControl.eFocusControl != OMX_IMAGE_FocusControlAuto )
             {