diff options
| author | Daniel Levin <dendy@ti.com> | 2012-07-25 16:54:03 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 16:54:03 -0500 |
| commit | 13269a9cde9eaf913ad18d1efa6709032d473529 (patch) | |
| tree | 7f0bdb68fd3eb47f0293a9cc034498f5c560e80d /camera/BaseCameraAdapter.cpp | |
| parent | 1a7ad0061380805c8c8197cc9d9b6a875840f086 (diff) | |
| parent | 528583d223bc151529deae18ba6e7f102e0810ba (diff) | |
| download | hardware_ti_omap4-13269a9cde9eaf913ad18d1efa6709032d473529.zip hardware_ti_omap4-13269a9cde9eaf913ad18d1efa6709032d473529.tar.gz hardware_ti_omap4-13269a9cde9eaf913ad18d1efa6709032d473529.tar.bz2 | |
Merge "camera: fix deadlock because of mStateSwitchLock" into jb-migration
Change-Id: I30238b6ff0a7cbab7a4908b88e1ca1be3ac3a89c
Signed-off-by: Daniel Levin <dendy@ti.com>
Diffstat (limited to 'camera/BaseCameraAdapter.cpp')
| -rw-r--r-- | camera/BaseCameraAdapter.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp index 7c0b9fc..33712f5 100644 --- a/camera/BaseCameraAdapter.cpp +++ b/camera/BaseCameraAdapter.cpp @@ -1940,6 +1940,12 @@ status_t BaseCameraAdapter::setState(CameraCommands operation) mNextState = PREVIEW_STATE; break; + case CAMERA_STOP_PREVIEW: + CAMHAL_LOGDB("Adapter state switch LOADED_PREVIEW_STATE->INTIALIZED_STATE event = 0x%x", + operation); + mNextState = INTIALIZED_STATE; + break; + //These events don't change the current state case CAMERA_QUERY_BUFFER_SIZE_IMAGE_CAPTURE: case CAMERA_QUERY_BUFFER_SIZE_PREVIEW_DATA: |