1 files changed, 33 insertions, 3 deletions

diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
index f2ea1b9d7..f02016654 100644
--- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
+++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
@@ -37,6 +37,7 @@
 #include "qandroidcamerasession.h"
 #include "androidmultimediautils.h"
 #include "qandroidmultimediautils.h"
+#include "qandroidvideooutput.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -217,15 +218,31 @@ void QAndroidCaptureSession::start()
     m_usedOutputLocation = QUrl::fromLocalFile(filePath);
     m_mediaRecorder->setOutputFile(filePath);
 
+    // Even though the Android doc explicitly says that calling MediaRecorder.setPreviewDisplay()
+    // is not necessary when the Camera already has a Surface, it doesn't actually work on some
+    // devices. For example on the Samsung Galaxy Tab 2, the camera server dies after prepare()
+    // and start() if MediaRecorder.setPreviewDispaly() is not called.
+    if (m_cameraSession) {
+        // When using a SurfaceTexture, we need to pass a new one to the MediaRecorder, not the same
+        // one that is set on the Camera or it will crash, hence the reset().
+        m_cameraSession->videoOutput()->reset();
+        if (m_cameraSession->videoOutput()->surfaceTexture())
+            m_mediaRecorder->setSurfaceTexture(m_cameraSession->videoOutput()->surfaceTexture());
+        else if (m_cameraSession->videoOutput()->surfaceHolder())
+            m_mediaRecorder->setSurfaceHolder(m_cameraSession->videoOutput()->surfaceHolder());
+    }
+
     if (!m_mediaRecorder->prepare()) {
         emit error(QMediaRecorder::FormatError, QLatin1String("Unable to prepare the media recorder."));
-        restartViewfinder();
+        if (m_cameraSession)
+            restartViewfinder();
         return;
     }
 
     if (!m_mediaRecorder->start()) {
         emit error(QMediaRecorder::FormatError, QLatin1String("Unable to start the media recorder."));
-        restartViewfinder();
+        if (m_cameraSession)
+            restartViewfinder();
         return;
     }
 
@@ -412,13 +429,26 @@ void QAndroidCaptureSession::applySettings()
 
 void QAndroidCaptureSession::updateViewfinder()
 {
-    m_cameraSession->camera()->stopPreview();
+    m_cameraSession->camera()->stopPreviewSynchronous();
     m_cameraSession->adjustViewfinderSize(m_videoSettings.resolution(), false);
 }
 
 void QAndroidCaptureSession::restartViewfinder()
 {
+    if (!m_cameraSession)
+        return;
+
     m_cameraSession->camera()->reconnect();
+
+    // This is not necessary on most devices, but it crashes on some if we don't stop the
+    // preview and reset the preview display on the camera when recording is over.
+    m_cameraSession->camera()->stopPreviewSynchronous();
+    m_cameraSession->videoOutput()->reset();
+    if (m_cameraSession->videoOutput()->surfaceTexture())
+        m_cameraSession->camera()->setPreviewTexture(m_cameraSession->videoOutput()->surfaceTexture());
+    else if (m_cameraSession->videoOutput()->surfaceHolder())
+        m_cameraSession->camera()->setPreviewDisplay(m_cameraSession->videoOutput()->surfaceHolder());
+
     m_cameraSession->camera()->startPreview();
     m_cameraSession->setReadyForCapture(true);
 }