diff options
author | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-11-15 10:47:17 +0100 |
---|---|---|
committer | Val Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-11-15 15:40:17 +0100 |
commit | 49bf444b44dac10602af0af862f0951835ea5895 (patch) | |
tree | 34c177042ab75bcd988cd012edf24737a63b30cd /src/plugins/android/src/common | |
parent | 72fdf4b20e916ea87b334be1a35235ac1023e0d8 (diff) |
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>
Diffstat (limited to 'src/plugins/android/src/common')
-rw-r--r-- | src/plugins/android/src/common/qandroidmultimediautils.cpp | 9 | ||||
-rw-r--r-- | src/plugins/android/src/common/qandroidmultimediautils.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/plugins/android/src/common/qandroidmultimediautils.cpp b/src/plugins/android/src/common/qandroidmultimediautils.cpp index fa6e7da65..1f03d5d29 100644 --- a/src/plugins/android/src/common/qandroidmultimediautils.cpp +++ b/src/plugins/android/src/common/qandroidmultimediautils.cpp @@ -113,7 +113,7 @@ AndroidCamera::ImageFormat qt_androidImageFormatFromPixelFormat(QVideoFrame::Pix } } -bool qt_androidRequestPermission(const QString &key) +static bool androidRequestPermission(const QString &key) { using namespace QtAndroidPrivate; @@ -139,9 +139,14 @@ bool qt_androidRequestPermission(const QString &key) return true; } +bool qt_androidRequestCameraPermission() +{ + return androidRequestPermission(QLatin1String("android.permission.CAMERA")); +} + bool qt_androidRequestRecordingPermission() { - return qt_androidRequestPermission(QLatin1String("android.permission.RECORD_AUDIO")); + return androidRequestPermission(QLatin1String("android.permission.RECORD_AUDIO")); } QT_END_NAMESPACE diff --git a/src/plugins/android/src/common/qandroidmultimediautils.h b/src/plugins/android/src/common/qandroidmultimediautils.h index bbd2e9aa5..381671cb8 100644 --- a/src/plugins/android/src/common/qandroidmultimediautils.h +++ b/src/plugins/android/src/common/qandroidmultimediautils.h @@ -55,7 +55,7 @@ bool qt_sizeLessThan(const QSize &s1, const QSize &s2); QVideoFrame::PixelFormat qt_pixelFormatFromAndroidImageFormat(AndroidCamera::ImageFormat f); AndroidCamera::ImageFormat qt_androidImageFormatFromPixelFormat(QVideoFrame::PixelFormat f); -bool qt_androidRequestPermission(const QString &key); +bool qt_androidRequestCameraPermission(); bool qt_androidRequestRecordingPermission(); QT_END_NAMESPACE |