From 958bc5793fba3011ce20d24047d87466b0a008ea Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 3 Aug 2016 08:34:20 +0200 Subject: Add QtAndroidPrivate::context() This simplifies the retrieval of the correct Context object. Task-number: QTBUG-55102 Change-Id: I303bc5393a7900ceb4bde36e711938f3f49075c1 Reviewed-by: BogDan Vatra --- src/corelib/kernel/qjnihelpers.cpp | 10 ++++++++++ src/corelib/kernel/qjnihelpers_p.h | 1 + 2 files changed, 11 insertions(+) diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index 76f530ab9c..102b835089 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -357,6 +357,16 @@ jobject QtAndroidPrivate::service() return g_jService; } +jobject QtAndroidPrivate::context() +{ + if (g_jActivity) + return g_jActivity; + if (g_jService) + return g_jService; + + return 0; +} + JavaVM *QtAndroidPrivate::javaVM() { return g_javaVM; diff --git a/src/corelib/kernel/qjnihelpers_p.h b/src/corelib/kernel/qjnihelpers_p.h index d57228b856..43e2f3af20 100644 --- a/src/corelib/kernel/qjnihelpers_p.h +++ b/src/corelib/kernel/qjnihelpers_p.h @@ -101,6 +101,7 @@ namespace QtAndroidPrivate Q_CORE_EXPORT jobject activity(); Q_CORE_EXPORT jobject service(); + Q_CORE_EXPORT jobject context(); Q_CORE_EXPORT JavaVM *javaVM(); Q_CORE_EXPORT jint initJNI(JavaVM *vm, JNIEnv *env); jobject classLoader(); -- cgit v1.2.3