Don't use QMediaService anymore to get the camera controls

Instead retrieve them from the camera control.

Change-Id: Ic996a672f102f7dc3fc5e3b73f977d3864e9a129
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
index 62a548830..700ce2928 100644
--- a/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
+++ b/src/multimedia/platform/android/mediacapture/qandroidcameracontrol.cpp
@@ -39,6 +39,9 @@
 
 #include "qandroidcameracontrol_p.h"
 #include "qandroidcamerasession_p.h"
+#include "qandroidcameraexposurecontrol_p.h"
+#include "qandroidcamerafocuscontrol_p.h"
+#include "qandroidcameraimageprocessingcontrol_p.h"
 #include <qmediadevicemanager.h>
 #include <qcamerainfo.h>
 #include <qtimer.h>
@@ -235,6 +238,21 @@ void QAndroidCameraControl::unlock(QCamera::LockTypes locks)
     }
 }
 
+QCameraFocusControl *QAndroidCameraControl::focusControl()
+{
+    return m_cameraSession->focusControl();
+}
+
+QCameraExposureControl *QAndroidCameraControl::exposureControl()
+{
+    return m_cameraSession->exposureControl();
+}
+
+QCameraImageProcessingControl *QAndroidCameraControl::imageProcessingControl()
+{
+    return m_cameraSession->imageProcessingControl();
+}
+
 void QAndroidCameraControl::onCameraOpened()
 {
     m_supportedLocks = QCamera::NoLock;