diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-13 17:04:12 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-12-04 11:41:31 +0000 |
| commit | 43f3d14a99431da5e0ebd29f6c1f27526a6e2d48 (patch) | |
| tree | 1d4b279e4e9baf62dc173feac57dc93aadd75e3b /src/plugins/android/src/wrappers/jni/androidcamera.cpp | |
| parent | 8debbfbc9b7fe035362afc3838e7cec595efb394 (diff) | |
Android: fix QMediaRecorder crashing the camera server on some devices.
Some devices require MediaRecorder.setPreviewDisplay() to always be
called, even though the Android doc says otherwise.
Task-number: QTBUG-37837
Change-Id: I1e9b56f06e7c41bdf684f93b5ec7635f8ae9f379
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/android/src/wrappers/jni/androidcamera.cpp')
| -rw-r--r-- | src/plugins/android/src/wrappers/jni/androidcamera.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp index 083803e38..b506f4fd4 100644 --- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp +++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp @@ -744,6 +744,12 @@ void AndroidCamera::stopPreview() QMetaObject::invokeMethod(d, "stopPreview"); } +void AndroidCamera::stopPreviewSynchronous() +{ + Q_D(AndroidCamera); + QMetaObject::invokeMethod(d, "stopPreview", Qt::BlockingQueuedConnection); +} + AndroidCameraPrivate::AndroidCameraPrivate() : QObject(), m_parametersMutex(QMutex::Recursive) |