From 2e373e44ac5577e4b96f87ef7d6b4cde23710293 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Mon, 17 May 2021 12:02:02 +0300
Subject: [PATCH] Add isValid() call to QJniEnvironment

Task-number: QTBUG-92952
Change-Id: I3bce2881c10a8bfcc8771002a3349644c6f05cb3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/corelib/kernel/qjnienvironment.cpp | 10 ++++++++++
 src/corelib/kernel/qjnienvironment.h   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/corelib/kernel/qjnienvironment.cpp b/src/corelib/kernel/qjnienvironment.cpp
index 8c1f19ce82..d86cc821d7 100644
--- a/src/corelib/kernel/qjnienvironment.cpp
+++ b/src/corelib/kernel/qjnienvironment.cpp
@@ -137,6 +137,16 @@ QJniEnvironment::~QJniEnvironment()
     checkAndClearExceptions();
 }
 
+/*!
+    Returns \c true if this instance holds a valid JNIEnv object.
+
+    \since 6.2
+*/
+bool QJniEnvironment::isValid() const
+{
+    return d->jniEnv;
+}
+
 /*!
     \fn JNIEnv *QJniEnvironment::operator->() const
 
diff --git a/src/corelib/kernel/qjnienvironment.h b/src/corelib/kernel/qjnienvironment.h
index 66835f7c68..c98a1d39ed 100644
--- a/src/corelib/kernel/qjnienvironment.h
+++ b/src/corelib/kernel/qjnienvironment.h
@@ -54,6 +54,7 @@ class Q_CORE_EXPORT QJniEnvironment
 public:
     QJniEnvironment();
     ~QJniEnvironment();
+    bool isValid() const;
     JNIEnv *operator->() const;
     JNIEnv &operator*() const;
     JNIEnv *jniEnv() const;