diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-11-07 16:54:31 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-11-07 16:54:31 -0800 |
| commit | 707e301de8b52780a7f0e88e6f25ac919c23671f (patch) | |
| tree | bb3435c3b0fac8bf78867774fdfb2f3c870cdfd9 /camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | |
| parent | b96dffd40e25d29a61f9fbd7f2e5968b5335b957 (diff) | |
| download | omap4xxx-omapzoom-jb-mr1-dev.tar.gz | |
Revert "CameraHal: Sync AF cancel with incoming OMX events"android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-releasejb-mr1-dev
This reverts commit b96dffd40e25d29a61f9fbd7f2e5968b5335b957.
Bug: 7495861
Diffstat (limited to 'camera/inc/OMXCameraAdapter/OMXCameraAdapter.h')
| -rw-r--r-- | camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h index 1f1fd9f7..59c5efc9 100644 --- a/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h +++ b/camera/inc/OMXCameraAdapter/OMXCameraAdapter.h @@ -939,10 +939,6 @@ private: Mutex mFrameCountMutex; Condition mFirstFrameCondition; - static const nsecs_t CANCEL_AF_TIMEOUT; - Mutex mCancelAFMutex; - Condition mCancelAFCond; - Mutex mDoAFMutex; Condition mDoAFCond; |