summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src/wrappers
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-09-28 16:41:44 +0300
committerBogDan Vatra <bogdan@kdab.com>2016-09-28 16:02:59 +0000
commitad698f49d1e2aa8984f4569ebf5c598238fa4691 (patch)
tree47da510d49a127513e655c2768e0042d42cad6e7 /src/plugins/android/src/wrappers
parent256ee311b936d69561e97f7f8ee832cff93cb509 (diff)
Pass the context to QtAndroidMediaPlayer
This way it can be used in a service Task-number: QTBUG-54506 Change-Id: I2d75b69dfbf7b345322f7625baf544af2af200c5 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/android/src/wrappers')
-rw-r--r--src/plugins/android/src/wrappers/jni/androidmediaplayer.cpp5
1 files changed, 3 insertions, 2 deletions
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);
}