Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp

Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793

2 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.h b/src/plugins/android/src/wrappers/jni/androidcamera.h
index f4694d7dc..1a59ff3c7 100644
--- a/src/plugins/android/src/wrappers/jni/androidcamera.h
+++ b/src/plugins/android/src/wrappers/jni/androidcamera.h
@@ -62,6 +62,7 @@ struct AndroidCameraInfo
     QCamera::Position position;
     int orientation;
 };
+Q_DECLARE_TYPEINFO(AndroidCameraInfo, Q_MOVABLE_TYPE);
 
 class AndroidCamera : public QObject
 {
diff --git a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
index f65d6aade..582d8aa9d 100644
--- a/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp
@@ -57,10 +57,11 @@ AndroidMediaPlayer::AndroidMediaPlayer()
     : QObject()
 {
     QWriteLocker locker(rwLock);
+    auto context = QtAndroidPrivate::activity() ? QtAndroidPrivate::activity() : QtAndroidPrivate::service();
     const jlong id = reinterpret_cast<jlong>(this);
     mMediaPlayer = QJNIObjectPrivate(QtAndroidMediaPlayerClassName,
-                                     "(Landroid/app/Activity;J)V",
-                                     QtAndroidPrivate::activity(),
+                                     "(Landroid/content/Context;J)V",
+                                     context,
                                      id);
     mediaPlayers->append(this);
 }