Merge remote-tracking branch 'origin/5.7.1' into 5.7

Change-Id: I6690c4161c57734ad03ee3e03311a3e62f181e89

3 files changed, 42 insertions, 8 deletions

diff --git a/dist/changes-5.7.1 b/dist/changes-5.7.1
new file mode 100644
index 000000000..d7cf4709b
--- /dev/null
+++ b/dist/changes-5.7.1
@@ -0,0 +1,34 @@
+Qt 5.7.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.7.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.7 series is binary compatible with the 5.6.x series.
+Applications compiled for 5.6 will continue to run with 5.7.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Android
+-------
+
+ - QCamera::setViewfinderSettings() and all the related functions to query
+   the supported viewfinder settings are now functional.
+
+WinRT
+-----
+
+ - [QTBUG-55894] The QIODevice passed to a QAudioInput / QAudioOutput is
+   now written / read from the same thread it was created in.
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
index d0983d38a..2a66fa2c4 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java
@@ -44,7 +44,6 @@ import java.lang.String;
 import java.io.FileInputStream;
 
 // API is level is < 9 unless marked otherwise.
-import android.app.Activity;
 import android.content.Context;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -68,7 +67,7 @@ public class QtAndroidMediaPlayer
     private MediaPlayer mMediaPlayer = null;
     private Uri mUri = null;
     private final long mID;
-    private final Activity mActivity;
+    private final Context mContext;
     private boolean mMuted = false;
     private int mVolume = 100;
     private static final String TAG = "Qt MediaPlayer";
@@ -207,10 +206,10 @@ public class QtAndroidMediaPlayer
 
     }
 
-    public QtAndroidMediaPlayer(final Activity activity, final long id)
+    public QtAndroidMediaPlayer(final Context context, final long id)
     {
         mID = id;
-        mActivity = activity;
+        mContext = context;
     }
 
     private void setState(int state)
@@ -363,7 +362,7 @@ public class QtAndroidMediaPlayer
             final boolean inAssets = (mUri.getScheme().compareTo("assets") == 0);
             if (inAssets) {
                 final String asset = mUri.getPath().substring(1 /* Remove first '/' */);
-                final AssetManager am = mActivity.getAssets();
+                final AssetManager am = mContext.getAssets();
                 afd = am.openFd(asset);
                 final long offset = afd.getStartOffset();
                 final long length = afd.getLength();
@@ -374,7 +373,7 @@ public class QtAndroidMediaPlayer
                 FileDescriptor fd = fis.getFD();
                 mMediaPlayer.setDataSource(fd);
             } else {
-                mMediaPlayer.setDataSource(mActivity, mUri);
+                mMediaPlayer.setDataSource(mContext, mUri);
             }
             setState(State.Initialized);
         } catch (final IOException e) {
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);
 }