1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Fix freeze on start when the activity was destroyed before

Browse Source 
This can be tested by enabling "Don't keep activities" in the developer
options. With this option Android will immediately destroy the activity
when it is moved to the background. In this case registerBackends will
be called the first time before the BackendRegister was created. Because
m_backendsRegistered was set to true even if it failed, the final call has
no effect. So we need to ensure to set m_backendsRegistered only if a
BackendRegister is available.

Fixes: QTBUG-132085
Pick-to: 6.8
Change-Id: I2ea1c0e0737c982594ceb06cbaf540399c45e3f4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 9903242ecab82c1ed72dcaf90e90a171c942a84a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Lars Schmertmann 2024-12-25 13:41:29 +01:00 committed by Qt Cherry-pick Bot
parent b72c4988fb
commit 850ed0222f
5 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/android/jar/src/org/qtproject/qt/android/BackendRegister.java
View File

@ -4,6 +4,7 @@ package org.qtproject.qt.android;
class BackendRegister
{
static native boolean isNull();
static native void registerBackend(Class interfaceType, Object interfaceObject);
static native void unregisterBackend(Class interfaceType);
}

7
src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
View File

@ -59,8 +59,9 @@ class QtActivityDelegate extends QtActivityDelegateBase
void registerBackends()
{
if (m_backendsRegistered)
if (m_backendsRegistered || BackendRegister.isNull())
return;
m_backendsRegistered = true;
BackendRegister.registerBackend(QtWindowInterface.class, QtActivityDelegate.this);
BackendRegister.registerBackend(QtAccessibilityInterface.class, QtActivityDelegate.this);
@ -74,6 +75,10 @@ class QtActivityDelegate extends QtActivityDelegateBase
return;
m_backendsRegistered = false;
if (BackendRegister.isNull())
return;
BackendRegister.unregisterBackend(QtWindowInterface.class);
BackendRegister.unregisterBackend(QtAccessibilityInterface.class);
BackendRegister.unregisterBackend(QtMenuInterface.class);

7
src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
View File

@ -88,12 +88,19 @@ class QtEmbeddedDelegate extends QtActivityDelegateBase
synchronized (this) {
m_stateDetails = details;
if (details.isStarted && !m_backendsRegistered) {
if (BackendRegister.isNull())
return;
m_backendsRegistered = true;
BackendRegister.registerBackend(QtWindowInterface.class, this);
BackendRegister.registerBackend(QtMenuInterface.class, this);
BackendRegister.registerBackend(QtInputInterface.class, m_inputDelegate);
} else if (!details.isStarted && m_backendsRegistered) {
m_backendsRegistered = false;
if (BackendRegister.isNull())
return;
BackendRegister.unregisterBackend(QtWindowInterface.class);
BackendRegister.unregisterBackend(QtMenuInterface.class);
BackendRegister.unregisterBackend(QtInputInterface.class);

8
src/plugins/platforms/android/androidbackendregister.cpp
View File

@ -14,10 +14,16 @@ Q_DECLARE_JNI_CLASS(BackendRegister, "org/qtproject/qt/android/BackendRegister")
bool AndroidBackendRegister::registerNatives()
{
return QtJniTypes::BackendRegister::registerNativeMethods(
{ Q_JNI_NATIVE_SCOPED_METHOD(registerBackend, AndroidBackendRegister),
{ Q_JNI_NATIVE_SCOPED_METHOD(isNull, AndroidBackendRegister),
Q_JNI_NATIVE_SCOPED_METHOD(registerBackend, AndroidBackendRegister),
Q_JNI_NATIVE_SCOPED_METHOD(unregisterBackend, AndroidBackendRegister) });
}
jboolean AndroidBackendRegister::isNull(JNIEnv *, jclass)
{
return QtAndroid::backendRegister() == nullptr;
}
void AndroidBackendRegister::registerBackend(JNIEnv *, jclass, jclass interfaceClass,
jobject interface)
{

2
src/plugins/platforms/android/androidbackendregister.h
View File

@ -60,6 +60,8 @@ private:
QMutex m_registerMutex;
QMap<QString, QJniObject> m_register;
static jboolean isNull(JNIEnv *, jclass);
Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(isNull)
static void registerBackend(JNIEnv *, jclass, jclass interfaceClass, jobject interface);
Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(registerBackend)
static void unregisterBackend(JNIEnv *, jclass, jclass interfaceClass);