diff options
| author | Tyler Luu <tluu@ti.com> | 2011-11-10 22:00:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 22:00:07 +0000 |
| commit | 8ba45d28a233a7a51c2c70f30c8a5e99c6d02deb (patch) | |
| tree | a97746c5e19983c99bee0ede40ddc463a5552087 /camera | |
| parent | b5aa27b1eb67502450213b8c49f4e12454c4d284 (diff) | |
| parent | 334dd8a961fcfe53c083b2b8a0e7041065704a7d (diff) | |
| download | hardware_ti_omap4xxx-8ba45d28a233a7a51c2c70f30c8a5e99c6d02deb.zip hardware_ti_omap4xxx-8ba45d28a233a7a51c2c70f30c8a5e99c6d02deb.tar.gz hardware_ti_omap4xxx-8ba45d28a233a7a51c2c70f30c8a5e99c6d02deb.tar.bz2 | |
am 334dd8a9: am c5831812: am cbaa6646: CameraHAL: Fix preview not starting after surface is abdandoned
* commit '334dd8a961fcfe53c083b2b8a0e7041065704a7d':
CameraHAL: Fix preview not starting after surface is abdandoned
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/CameraHal.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index 7e18330..8e14fec 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -1715,10 +1715,11 @@ status_t CameraHal::setPreviewWindow(struct preview_stream_ops *window) } }else { - /* If mDisplayAdpater is already created. No need to do anything. - * We get a surface handle directly now, so we can reconfigure surface - * itself in DisplayAdapter if dimensions have changed - */ + // Update the display adapter with the new window that is passed from CameraService + ret = mDisplayAdapter->setPreviewWindow(window); + if (previewEnabled()) { + restartPreview(); + } } LOG_FUNCTION_NAME_EXIT; |