diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2023-01-09 11:58:33 +0200 |
|---|---|---|
| committer | Samuel Mira <samuel.mira@qt.io> | 2023-01-11 14:28:45 +0200 |
| commit | f18be9c59cb38fb3cc5046932c5587997af35cf5 (patch) | |
| tree | fcc13a3f17284f72029bf3c2e95d39610b16760e /src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp | |
| parent | 1e8653062d6d23e4dc026661c485e74750c9d4c2 (diff) | |
Android: Prevent Camera set automatically active
The Android backend was different from the rest of the backends and it
automatically started the camera when it was attached to media capture
session. This patch changes to set it as the rest of the backends.
Fixes: QTBUG-109415
Pick-to: 6.5 6.4 6.2
Change-Id: I88342e9db068bec05404f5bfd91f73ea5015bb96
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp')
| -rw-r--r-- | src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp b/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp index 0a1fde54f..e2b551d35 100644 --- a/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp +++ b/src/plugins/multimedia/android/mediacapture/qandroidmediacapturesession.cpp @@ -47,10 +47,8 @@ void QAndroidMediaCaptureSession::setCamera(QPlatformCamera *camera) m_cameraControl->setCaptureSession(nullptr); m_cameraControl = control; - if (m_cameraControl) { + if (m_cameraControl) m_cameraControl->setCaptureSession(this); - m_cameraControl->setActive(true); - } emit cameraChanged(); } |