commit 781b87a7d10adc9855ae80ecf16b971d8c136c45
author Kenny Root <kroot@google.com> Mon Mar 26 14:12:02 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 26 14:12:02 2012 -0700
tree d99025142a1a4666666e6166f136284a67dbf720
parent a35209b2e26289458670e04d6e62dee3d085ea63
parent 08f4da4b7ac801a691376dd94aa2af35b31e7998

Merge "SMC: Initial release of libtf_crypto_sst.so"

camera/OMXCameraAdapter/OMXFocus.cpp

diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp
index fcc2010..e9a969c 100644
--- a/camera/OMXCameraAdapter/OMXFocus.cpp
+++ b/camera/OMXCameraAdapter/OMXFocus.cpp
@@ -804,7 +804,8 @@
         return;
     }
 
-    if (eFocusStatus.eFocusStatus != OMX_FocusStatusRequest) {
+    if ( ( eFocusStatus.eFocusStatus != OMX_FocusStatusRequest ) &&
+         ( eFocusStatus.eFocusStatus != OMX_FocusStatusOff ) ) {
         // signal doAutoFocus when a end of scan message comes
         // ignore start of scan
         Mutex::Autolock lock(mDoAFMutex);

hwc/hwc.c

diff --git a/hwc/hwc.c b/hwc/hwc.c
index 4ac3817..bc54f12 100644
--- a/hwc/hwc.c
+++ b/hwc/hwc.c
@@ -1860,7 +1860,7 @@
     memset(hwc_dev, 0, sizeof(*hwc_dev));
 
     hwc_dev->base.common.tag = HARDWARE_DEVICE_TAG;
-    hwc_dev->base.common.version = HWC_API_VERSION;
+    hwc_dev->base.common.version = HWC_DEVICE_API_VERSION;
     hwc_dev->base.common.module = (hw_module_t *)module;
     hwc_dev->base.common.close = omap4_hwc_device_close;
     hwc_dev->base.prepare = omap4_hwc_prepare;
@@ -2009,8 +2009,8 @@
     .base = {
         .common = {
             .tag =                  HARDWARE_MODULE_TAG,
-            .version_major =        1,
-            .version_minor =        0,
+            .module_api_version =   HWC_MODULE_API_VERSION,
+            .hal_api_version =      HARDWARE_HAL_API_VERSION,
             .id =                   HWC_HARDWARE_MODULE_ID,
             .name =                 "OMAP 44xx Hardware Composer HAL",
             .author =               "Texas Instruments",