Android: Remove usage of qt_androidRequestPermission

Use specific function instead, e.g. qt_androidRequestCameraPermission.

Change-Id: I925e4d8ac4f1993c073930a79453894dd516d769
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 4 insertions, 11 deletions

diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp
index 2f32fb742..3ea7bc773 100644
--- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp
@@ -58,11 +58,6 @@ QT_BEGIN_NAMESPACE
 
 static const char QtCameraListenerClassName[] = "org/qtproject/qt5/android/multimedia/QtCameraListener";
 
-static QString cameraPermissionKey()
-{
-    return QStringLiteral("android.permission.CAMERA");
-}
-
 typedef QHash<int, AndroidCamera *> CameraMap;
 Q_GLOBAL_STATIC(CameraMap, cameras)
 Q_GLOBAL_STATIC(QReadWriteLock, rwLock)
@@ -324,6 +319,9 @@ AndroidCamera::~AndroidCamera()
 
 AndroidCamera *AndroidCamera::open(int cameraId)
 {
+    if (!qt_androidRequestCameraPermission())
+        return nullptr;
+
     AndroidCameraPrivate *d = new AndroidCameraPrivate();
     QThread *worker = new QThread;
     worker->start();
@@ -764,7 +762,7 @@ QJNIObjectPrivate AndroidCamera::getCameraObject()
 
 int AndroidCamera::getNumberOfCameras()
 {
-    if (!requestCameraPermission())
+    if (!qt_androidRequestCameraPermission())
         return 0;
 
     return QJNIObjectPrivate::callStaticMethod<jint>("android/hardware/Camera",
@@ -801,11 +799,6 @@ void AndroidCamera::getCameraInfo(int id, AndroidCameraInfo *info)
     }
 }
 
-bool AndroidCamera::requestCameraPermission()
-{
-    return qt_androidRequestPermission(cameraPermissionKey());
-}
-
 void AndroidCamera::startPreview()
 {
     Q_D(AndroidCamera);