diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-11-08 15:58:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 15:58:57 -0800 |
| commit | 64c6d6dddfe9b1a0fdd5b501ed343c82c345b7eb (patch) | |
| tree | 2cf51312142234d0af44374e5adf1ec431506e8b /camera/inc/OMXCameraAdapter/OMXCameraAdapter.h | |
| parent | a0763482ea8c9cb1bf48e9c5f103858bf1e49e4e (diff) | |
| parent | 015960eb1f62f682432137441737d8440a871536 (diff) | |
| download | omap4xxx-omapzoom-64c6d6dddfe9b1a0fdd5b501ed343c82c345b7eb.tar.gz | |
am 015960eb: am 707e301d: Revert "CameraHal: Sync AF cancel with incoming OMX events"
* commit '015960eb1f62f682432137441737d8440a871536':
Revert "CameraHal: Sync AF cancel with incoming OMX events"
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; |