diff options
Diffstat (limited to 'src/plugins')
3 files changed, 16 insertions, 0 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp index 9e38c8539..a5aff51cd 100644 --- a/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcapturesession.cpp @@ -44,6 +44,7 @@ #include "androidmultimediautils.h" #include "qandroidmultimediautils.h" #include "qandroidvideooutput.h" +#include "qandroidglobal.h" QT_BEGIN_NAMESPACE @@ -177,6 +178,14 @@ void QAndroidCaptureSession::start() m_mediaRecorder->release(); delete m_mediaRecorder; } + + + if (!AndroidMediaRecorder::requestRecordingPermission()) { + setStatus(QMediaRecorder::UnavailableStatus); + Q_EMIT error(QMediaRecorder::ResourceError, QLatin1String("Permission denied.")); + return; + } + m_mediaRecorder = new AndroidMediaRecorder; connect(m_mediaRecorder, SIGNAL(error(int,int)), this, SLOT(onError(int,int))); connect(m_mediaRecorder, SIGNAL(info(int,int)), this, SLOT(onInfo(int,int))); diff --git a/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp b/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp index a707dd903..d0101411b 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp +++ b/src/plugins/android/src/wrappers/jni/androidmediarecorder.cpp @@ -42,6 +42,8 @@ #include "androidcamera.h" #include "androidsurfacetexture.h" #include "androidsurfaceview.h" +#include "qandroidglobal.h" +#include "qandroidmultimediautils.h" #include <QtCore/private/qjni_p.h> #include <qmap.h> @@ -381,6 +383,10 @@ void AndroidMediaRecorder::setSurfaceHolder(AndroidSurfaceHolder *holder) } } +bool AndroidMediaRecorder::requestRecordingPermission() +{ + return qt_androidRequestPermission(QLatin1String("android.permission.RECORD_AUDIO")); +} bool AndroidMediaRecorder::initJNI(JNIEnv *env) { diff --git a/src/plugins/android/src/wrappers/jni/androidmediarecorder.h b/src/plugins/android/src/wrappers/jni/androidmediarecorder.h index e4b3a80ea..cd2d164d8 100644 --- a/src/plugins/android/src/wrappers/jni/androidmediarecorder.h +++ b/src/plugins/android/src/wrappers/jni/androidmediarecorder.h @@ -160,6 +160,7 @@ public: void setSurfaceTexture(AndroidSurfaceTexture *texture); void setSurfaceHolder(AndroidSurfaceHolder *holder); + static bool requestRecordingPermission(); static bool initJNI(JNIEnv *env); Q_SIGNALS: |