diff options
author | Tyler Luu <tluu@ti.com> | 2011-11-10 21:58:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:58:29 +0000 |
commit | 334dd8a961fcfe53c083b2b8a0e7041065704a7d (patch) | |
tree | 1a0319c7d75eb83ee7e8c13d004485f9343124a9 | |
parent | fef083876a27ebab9451c0151ce6fbaae0f66ccf (diff) | |
parent | c58318126fdf0a295987d0d9338f41c80e273431 (diff) | |
download | hardware_ti_omap4xxx-334dd8a961fcfe53c083b2b8a0e7041065704a7d.zip hardware_ti_omap4xxx-334dd8a961fcfe53c083b2b8a0e7041065704a7d.tar.gz hardware_ti_omap4xxx-334dd8a961fcfe53c083b2b8a0e7041065704a7d.tar.bz2 |
am c5831812: am cbaa6646: CameraHAL: Fix preview not starting after surface is abdandoned
* commit 'c58318126fdf0a295987d0d9338f41c80e273431':
CameraHAL: Fix preview not starting after surface is abdandoned
-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; |