summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-11-10 19:08:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-11 11:48:08 -0800
commiteb1fc89d3ab1704a59861ab27f4ae0b99f3de75b (patch)
tree9b24219d51be0c82e914f33e30782617ab992938
parentb1c5d8ef7fc96ef49a1eaef0d81ff35dc4d2e4e7 (diff)
downloadhardware_ti_omap4xxx-eb1fc89d3ab1704a59861ab27f4ae0b99f3de75b.zip
hardware_ti_omap4xxx-eb1fc89d3ab1704a59861ab27f4ae0b99f3de75b.tar.gz
hardware_ti_omap4xxx-eb1fc89d3ab1704a59861ab27f4ae0b99f3de75b.tar.bz2
Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9. we need to revert this change since this leads to a stop ship problem where we can only take a single picture.
-rw-r--r--camera/CameraHal.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp
index 8e14fec..7e18330 100644
--- a/camera/CameraHal.cpp
+++ b/camera/CameraHal.cpp
@@ -1715,11 +1715,10 @@ status_t CameraHal::setPreviewWindow(struct preview_stream_ops *window)
}
}else
{
- // Update the display adapter with the new window that is passed from CameraService
- ret = mDisplayAdapter->setPreviewWindow(window);
- if (previewEnabled()) {
- restartPreview();
- }
+ /* 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
+ */
}
LOG_FUNCTION_NAME_EXIT;