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

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;