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

Android: Remove unused qtActivityDelegate() API

Browse Source 
Since the new functionality interface feature has removed all calls to
qtActivityDelegate, this is no longer needed.

Task-number: QTBUG-118874
Change-Id: Ibf65f953be8c4694b543610b405b65b91f3ec9ee
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Petri Virkkunen 2024-04-09 13:28:33 +03:00
parent 01b6e8180b
commit cf816a57f6
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -54,8 +54,6 @@ static jobject m_resourcesObj = nullptr;
static jclass m_qtActivityClass = nullptr; static jclass m_qtActivityClass = nullptr;
static jclass m_qtServiceClass = nullptr; static jclass m_qtServiceClass = nullptr;
static QtJniTypes::QtActivityDelegateBase m_activityDelegate = nullptr;
static int m_pendingApplicationState = -1; static int m_pendingApplicationState = -1;
static QBasicMutex m_platformMutex; static QBasicMutex m_platformMutex;
@ -92,7 +90,6 @@ static const char m_methodErrorMsg[] = "Can't find method \"%s%s\"";
Q_CONSTINIT static QBasicAtomicInt startQtAndroidPluginCalled = Q_BASIC_ATOMIC_INITIALIZER(0); Q_CONSTINIT static QBasicAtomicInt startQtAndroidPluginCalled = Q_BASIC_ATOMIC_INITIALIZER(0);
Q_DECLARE_JNI_CLASS(QtEmbeddedDelegateFactory, "org/qtproject/qt/android/QtEmbeddedDelegateFactory")
Q_DECLARE_JNI_CLASS(QtWindowInterface, "org/qtproject/qt/android/QtWindowInterface") Q_DECLARE_JNI_CLASS(QtWindowInterface, "org/qtproject/qt/android/QtWindowInterface")
Q_DECLARE_JNI_CLASS(QtAccessibilityInterface, "org/qtproject/qt/android/QtAccessibilityInterface"); Q_DECLARE_JNI_CLASS(QtAccessibilityInterface, "org/qtproject/qt/android/QtAccessibilityInterface");
@ -190,25 +187,6 @@ namespace QtAndroid
jint(uiVisibility)); jint(uiVisibility));
} }
// FIXME: avoid direct access to QtActivityDelegate
QtJniTypes::QtActivityDelegateBase qtActivityDelegate()
{
using namespace QtJniTypes;
if (!m_activityDelegate.isValid()) {
if (isQtApplication()) {
auto context = QtAndroidPrivate::activity();
m_activityDelegate = context.callMethod<QtActivityDelegateBase>("getActivityDelegate");
} else {
m_activityDelegate = QJniObject::callStaticMethod<QtActivityDelegateBase>(
Traits<QtEmbeddedDelegateFactory>::className(),
"getActivityDelegate",
QtAndroidPrivate::activity());
}
}
return m_activityDelegate;
}
bool isQtApplication() bool isQtApplication()
{ {
// Returns true if the app is a Qt app, i.e. Qt controls the whole app and // Returns true if the app is a Qt app, i.e. Qt controls the whole app and

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

@ -50,8 +50,6 @@ namespace QtAndroid
AAssetManager *assetManager(); AAssetManager *assetManager();
jclass applicationClass(); jclass applicationClass();
QtJniTypes::QtActivityDelegateBase qtActivityDelegate();
// Keep synchronized with flags in ActivityDelegate.java // Keep synchronized with flags in ActivityDelegate.java
enum SystemUiVisibility { enum SystemUiVisibility {
SYSTEM_UI_VISIBILITY_NORMAL = 0, SYSTEM_UI_VISIBILITY_NORMAL = 0,