1 files changed, 19 insertions, 17 deletions
diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h
index b0f80204e9..f0c0a41683 100644
--- a/src/corelib/kernel/qjnihelpers_p.h
+++ b/src/corelib/kernel/qjnihelpers_p.h
@@ -18,6 +18,7 @@
 #include <jni.h>
 #include <functional>
 #include <QtCore/private/qglobal_p.h>
+#include <QtCore/qcoreapplication_platform.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,6 +46,13 @@ namespace QtAndroidPrivate
         virtual void handleResume();
     };
 
+    class Q_CORE_EXPORT OnBindListener
+    {
+    public:
+        virtual ~OnBindListener() {}
+        virtual jobject onBind(jobject intent) = 0;
+    };
+
     class Q_CORE_EXPORT GenericMotionEventListener
     {
     public:
@@ -59,24 +67,18 @@ namespace QtAndroidPrivate
         virtual bool handleKeyEvent(jobject event) = 0;
     };
 
-    class Q_CORE_EXPORT OnBindListener
-    {
-    public:
-        virtual ~OnBindListener() {}
-        virtual jobject onBind(jobject intent) = 0;
-    };
-
-    Q_CORE_EXPORT jobject activity();
-    Q_CORE_EXPORT jobject service();
-    Q_CORE_EXPORT jobject context();
+    Q_CORE_EXPORT QtJniTypes::Activity activity();
+    Q_CORE_EXPORT QtJniTypes::Service service();
+    Q_CORE_EXPORT QtJniTypes::Context context();
     Q_CORE_EXPORT JavaVM *javaVM();
     Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env);
     Q_CORE_EXPORT jclass findClass(const char *className, JNIEnv *env);
     jobject classLoader();
     Q_CORE_EXPORT jint androidSdkVersion();
 
-    bool registerPermissionNatives();
-    bool registerNativeInterfaceNatives();
+    bool registerPermissionNatives(QJniEnvironment &env);
+    bool registerNativeInterfaceNatives(QJniEnvironment &env);
+    bool registerExtrasNatives(QJniEnvironment &env);
 
     Q_CORE_EXPORT void handleActivityResult(jint requestCode, jint resultCode, jobject data);
     Q_CORE_EXPORT void registerActivityResultListener(ActivityResultListener *listener);
@@ -86,17 +88,17 @@ namespace QtAndroidPrivate
     Q_CORE_EXPORT void registerNewIntentListener(NewIntentListener *listener);
     Q_CORE_EXPORT void unregisterNewIntentListener(NewIntentListener *listener);
 
-    Q_CORE_EXPORT void handlePause();
-    Q_CORE_EXPORT void handleResume();
-    Q_CORE_EXPORT void registerResumePauseListener(ResumePauseListener *listener);
-    Q_CORE_EXPORT void unregisterResumePauseListener(ResumePauseListener *listener);
-
     Q_CORE_EXPORT void registerGenericMotionEventListener(GenericMotionEventListener *listener);
     Q_CORE_EXPORT void unregisterGenericMotionEventListener(GenericMotionEventListener *listener);
 
     Q_CORE_EXPORT void registerKeyEventListener(KeyEventListener *listener);
     Q_CORE_EXPORT void unregisterKeyEventListener(KeyEventListener *listener);
 
+    Q_CORE_EXPORT void handlePause();
+    Q_CORE_EXPORT void handleResume();
+    Q_CORE_EXPORT void registerResumePauseListener(ResumePauseListener *listener);
+    Q_CORE_EXPORT void unregisterResumePauseListener(ResumePauseListener *listener);
+
     Q_CORE_EXPORT void waitForServiceSetup();
     Q_CORE_EXPORT int acuqireServiceSetup(int flags);
     Q_CORE_EXPORT void setOnBindListener(OnBindListener *listener);