| commit | 0b9e2626b0843fa15dd569222f83607a1513936c | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed Apr 11 07:04:59 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Wed Apr 11 07:04:59 2012 -0700 |
| tree | 68028e7a45fa0e24f35c4813b9d837ab80a16ec3 | |
| parent | 96f2b555d2200fca7d8399c4c9a968590637aa31 [diff] | |
| parent | 6e070e754ddc6c2bc52466581485cce698f81d1b [diff] |
merge in jb-release history after reset to master
diff --git a/camera/OMXCameraAdapter/OMXFocus.cpp b/camera/OMXCameraAdapter/OMXFocus.cpp index 5703610..50e2c21 100644 --- a/camera/OMXCameraAdapter/OMXFocus.cpp +++ b/camera/OMXCameraAdapter/OMXFocus.cpp
@@ -108,6 +108,8 @@ return NO_ERROR; } + OMX_INIT_STRUCT_PTR (&focusStatus, OMX_PARAM_FOCUSSTATUSTYPE); + // If the app calls autoFocus, the camera will stop sending face callbacks. pauseFaceDetection(true);