From 1be4f74843b41f8bc1d1d64e83485f4eb864e8b4 Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Mon, 18 Jul 2016 16:57:13 +0300
Subject: [PATCH] This module doesn't need an Activity to work, a Context
object is enough
Task-number: QTBUG-54506
Change-Id: I81ad9b90fdc55aaaa828ef8256edb7bccca45e64
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
---
.../qt5/android/multimedia/QtMultimediaUtils.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java
index 917f02d48..e16d424cf 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtMultimediaUtils.java
@@ -40,7 +40,6 @@
package org.qtproject.qt5.android.multimedia;
import android.content.Context;
-import android.app.Activity;
import android.view.OrientationEventListener;
import android.os.Environment;
import android.media.MediaScannerConnection;
@@ -68,13 +67,13 @@ public class QtMultimediaUtils
}
}
- static private Activity m_activity = null;
+ static private Context m_context = null;
static private OrientationListener m_orientationListener = null;
- static public void setActivity(Activity activity, Object activityDelegate)
+ static public void setContext(Context context)
{
- m_activity = activity;
- m_orientationListener = new OrientationListener(activity);
+ m_context = context;
+ m_orientationListener = new OrientationListener(context);
}
public QtMultimediaUtils()
@@ -129,6 +128,6 @@ public class QtMultimediaUtils
static void registerMediaFile(String file)
{
- MediaScannerConnection.scanFile(m_activity, new String[] { file }, null, null);
+ MediaScannerConnection.scanFile(m_context, new String[] { file }, null, null);
}
}
--
GitLab