1 files changed, 83 insertions, 111 deletions

diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp
index b2a5dc7441..d900b74d37 100644
--- a/src/corelib/kernel/qjnihelpers.cpp
+++ b/src/corelib/kernel/qjnihelpers.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2022 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qjnihelpers_p.h"
 
@@ -44,7 +8,9 @@
 #include "qlist.h"
 #include "qmutex.h"
 #include "qsemaphore.h"
+#include "qreadwritelock.h"
 #include <QtCore/private/qcoreapplication_p.h>
+#include <QtCore/private/qlocking_p.h>
 
 #include <android/log.h>
 #include <deque>
@@ -60,8 +26,6 @@ namespace QtAndroidPrivate {
     ResumePauseListener::~ResumePauseListener() {}
     void ResumePauseListener::handlePause() {}
     void ResumePauseListener::handleResume() {}
-    GenericMotionEventListener::~GenericMotionEventListener() {}
-    KeyEventListener::~KeyEventListener() {}
 }
 
 static JavaVM *g_javaVM = nullptr;
@@ -69,43 +33,46 @@ static jobject g_jActivity = nullptr;
 static jobject g_jService = nullptr;
 static jobject g_jClassLoader = nullptr;
 
-Q_GLOBAL_STATIC_WITH_ARGS(QtAndroidPrivate::OnBindListener*, g_onBindListener, (nullptr));
-Q_GLOBAL_STATIC(QMutex, g_onBindListenerMutex);
+Q_CONSTINIT static QtAndroidPrivate::OnBindListener *g_onBindListener;
+Q_CONSTINIT static QBasicMutex g_onBindListenerMutex;
 Q_GLOBAL_STATIC(QSemaphore, g_waitForServiceSetupSemaphore);
-Q_GLOBAL_STATIC(QAtomicInt, g_serviceSetupLockers);
+Q_CONSTINIT static QBasicAtomicInt g_serviceSetupLockers = Q_BASIC_ATOMIC_INITIALIZER(0);
 
-namespace {
-    struct GenericMotionEventListeners {
-        QMutex mutex;
-        QList<QtAndroidPrivate::GenericMotionEventListener *> listeners;
-    };
-}
-Q_GLOBAL_STATIC(GenericMotionEventListeners, g_genericMotionEventListeners)
+Q_GLOBAL_STATIC(QReadWriteLock, g_updateMutex);
 
-static jboolean dispatchGenericMotionEvent(JNIEnv *, jclass, jobject event)
+static jboolean updateNativeActivity(JNIEnv *env, jclass = nullptr)
 {
-    jboolean ret = JNI_FALSE;
-    QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-    for (auto *listener : qAsConst(g_genericMotionEventListeners()->listeners))
-        ret |= listener->handleGenericMotionEvent(event);
-    return ret;
-}
 
-namespace {
-    struct KeyEventListeners {
-        QMutex mutex;
-        QList<QtAndroidPrivate::KeyEventListener *> listeners;
-    };
-}
-Q_GLOBAL_STATIC(KeyEventListeners, g_keyEventListeners)
+    jclass jQtNative = env->FindClass("org/qtproject/qt/android/QtNative");
+    if (QJniEnvironment::checkAndClearExceptions(env))
+        return JNI_FALSE;
 
-static jboolean dispatchKeyEvent(JNIEnv *, jclass, jobject event)
-{
-    jboolean ret = JNI_FALSE;
-    QMutexLocker locker(&g_keyEventListeners()->mutex);
-    for (auto *listener : qAsConst(g_keyEventListeners()->listeners))
-        ret |= listener->handleKeyEvent(event);
-    return ret;
+    jmethodID activityMethodID =
+            env->GetStaticMethodID(jQtNative, "activity", "()Landroid/app/Activity;");
+    if (QJniEnvironment::checkAndClearExceptions(env))
+        return JNI_FALSE;
+
+    jobject activity = env->CallStaticObjectMethod(jQtNative, activityMethodID);
+    if (QJniEnvironment::checkAndClearExceptions(env))
+        return JNI_FALSE;
+
+    QWriteLocker locker(g_updateMutex());
+
+    if (g_jActivity) {
+        env->DeleteGlobalRef(g_jActivity);
+        g_jActivity = nullptr;
+    }
+
+    if (activity) {
+        g_jActivity = env->NewGlobalRef(activity);
+        env->DeleteLocalRef(activity);
+    }
+
+    env->DeleteLocalRef(jQtNative);
+    if (QJniEnvironment::checkAndClearExceptions(env))
+        return JNI_FALSE;
+
+    return JNI_TRUE;
 }
 
 namespace {
@@ -269,8 +236,7 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
     }
 
     static const JNINativeMethod methods[] = {
-        {"dispatchGenericMotionEvent", "(Landroid/view/MotionEvent;)Z", reinterpret_cast<void *>(dispatchGenericMotionEvent)},
-        {"dispatchKeyEvent", "(Landroid/view/KeyEvent;)Z", reinterpret_cast<void *>(dispatchKeyEvent)},
+        {"updateNativeActivity", "()Z", reinterpret_cast<void *>(updateNativeActivity) },
     };
 
     const bool regOk = (env->RegisterNatives(jQtNative, methods, sizeof(methods) / sizeof(methods[0])) == JNI_OK);
@@ -278,33 +244,51 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env)
     if (!regOk && QJniEnvironment::checkAndClearExceptions(env))
         return JNI_ERR;
 
-    if (!registerPermissionNatives())
+    QJniEnvironment qJniEnv;
+    if (!registerPermissionNatives(qJniEnv))
+        return JNI_ERR;
+
+    if (!registerNativeInterfaceNatives(qJniEnv))
         return JNI_ERR;
 
-    if (!registerNativeInterfaceNatives())
+    if (!registerExtrasNatives(qJniEnv))
         return JNI_ERR;
 
     return JNI_OK;
 }
 
-jobject QtAndroidPrivate::activity()
+Q_CORE_EXPORT jobject qt_androidActivity()
 {
+    QReadLocker locker(g_updateMutex());
     return g_jActivity;
 }
 
-jobject QtAndroidPrivate::service()
+
+QtJniTypes::Activity QtAndroidPrivate::activity()
+{
+    QReadLocker locker(g_updateMutex());
+    return g_jActivity;
+}
+
+Q_CORE_EXPORT jobject qt_androidService()
 {
     return g_jService;
 }
 
-jobject QtAndroidPrivate::context()
+QtJniTypes::Service QtAndroidPrivate::service()
 {
+    return g_jService;
+}
+
+QtJniTypes::Context QtAndroidPrivate::context()
+{
+    QReadLocker locker(g_updateMutex());
     if (g_jActivity)
         return g_jActivity;
     if (g_jService)
         return g_jService;
 
-    return 0;
+    return nullptr;
 }
 
 JavaVM *QtAndroidPrivate::javaVM()
@@ -325,30 +309,6 @@ jint QtAndroidPrivate::androidSdkVersion()
     return sdkVersion;
 }
 
-void QtAndroidPrivate::registerGenericMotionEventListener(QtAndroidPrivate::GenericMotionEventListener *listener)
-{
-    QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-    g_genericMotionEventListeners()->listeners.push_back(listener);
-}
-
-void QtAndroidPrivate::unregisterGenericMotionEventListener(QtAndroidPrivate::GenericMotionEventListener *listener)
-{
-    QMutexLocker locker(&g_genericMotionEventListeners()->mutex);
-    g_genericMotionEventListeners()->listeners.removeOne(listener);
-}
-
-void QtAndroidPrivate::registerKeyEventListener(QtAndroidPrivate::KeyEventListener *listener)
-{
-    QMutexLocker locker(&g_keyEventListeners()->mutex);
-    g_keyEventListeners()->listeners.push_back(listener);
-}
-
-void QtAndroidPrivate::unregisterKeyEventListener(QtAndroidPrivate::KeyEventListener *listener)
-{
-    QMutexLocker locker(&g_keyEventListeners()->mutex);
-    g_keyEventListeners()->listeners.removeOne(listener);
-}
-
 void QtAndroidPrivate::waitForServiceSetup()
 {
     g_waitForServiceSetupSemaphore->acquire();
@@ -356,29 +316,41 @@ void QtAndroidPrivate::waitForServiceSetup()
 
 int QtAndroidPrivate::acuqireServiceSetup(int flags)
 {
-    g_serviceSetupLockers->ref();
+    g_serviceSetupLockers.ref();
     return flags;
 }
 
 void QtAndroidPrivate::setOnBindListener(QtAndroidPrivate::OnBindListener *listener)
 {
-    QMutexLocker lock(g_onBindListenerMutex());
-    *g_onBindListener = listener;
-    if (!g_serviceSetupLockers->deref())
+    const auto lock = qt_scoped_lock(g_onBindListenerMutex);
+    g_onBindListener = listener;
+    if (!g_serviceSetupLockers.deref())
         g_waitForServiceSetupSemaphore->release();
 }
 
 jobject QtAndroidPrivate::callOnBindListener(jobject intent)
 {
-    QMutexLocker lock(g_onBindListenerMutex());
-    if (*g_onBindListener)
-        return (*g_onBindListener)->onBind(intent);
+    const auto lock = qt_scoped_lock(g_onBindListenerMutex);
+    if (g_onBindListener)
+        return g_onBindListener->onBind(intent);
     return nullptr;
 }
 
+Q_CONSTINIT static QBasicAtomicInt g_androidDeadlockProtector = Q_BASIC_ATOMIC_INITIALIZER(0);
+
+bool QtAndroidPrivate::acquireAndroidDeadlockProtector()
+{
+    return g_androidDeadlockProtector.testAndSetAcquire(0, 1);
+}
+
+void QtAndroidPrivate::releaseAndroidDeadlockProtector()
+{
+    g_androidDeadlockProtector.storeRelease(0);
+}
+
 QT_END_NAMESPACE
 
-Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
 {
     Q_UNUSED(reserved);