From 958bc5793fba3011ce20d24047d87466b0a008ea Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@theqtcompany.com>
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 <bogdan@kdab.com>
---
 src/corelib/kernel/qjnihelpers.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/corelib/kernel/qjnihelpers.cpp')

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;
-- 
cgit v1.2.3