diff options
| author | Samuel Mira <samuel.mira@qt.io> | 2022-04-27 22:57:02 +0300 |
|---|---|---|
| committer | Samuel Mira <samuel.mira@qt.io> | 2022-04-28 22:14:00 +0000 |
| commit | 08a4fd357064cfefd8de7af13025a9f1cb04cafb (patch) | |
| tree | 69d1db856b2803cd8085b65c0cec2036b5c213fb /src/android/java | |
| parent | 189bcbea07cf640aeb4ce0937b86ee1b936a9425 (diff) | |
Android: Fix ANR when QtService and QtActivity load in same process
This patch is a fix to prevent the ANR. In this patch, the QtService
queries QtNative if there is a QtActivity or QtService started and,
in case there is, it does not begin the loading process. When that
happens, the QtService will be a regular android Service.
Fixes: QTBUG-99691
Pick-to: 5.15 6.2 6.3
Change-Id: Ibd8aa8554107a9744b53cca4e0dd7e6f9b25baea
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
Diffstat (limited to 'src/android/java')
| -rw-r--r-- | src/android/java/src/org/qtproject/qt/android/bindings/QtService.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java index afbe4350a0..06616391f0 100644 --- a/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java +++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtService.java @@ -37,6 +37,7 @@ package org.qtproject.qt.android.bindings; import android.app.Service; +import android.util.Log; import android.content.Intent; import android.content.res.Configuration; import android.os.Bundle; @@ -54,7 +55,17 @@ public class QtService extends Service /////////////// PLEASE DO NOT CHANGE THE FOLLOWING CODE ////////////////////////// ////////////////////////////////////////////////////////////////////////////////// protected void onCreateHook() { - m_loader.onCreate(); + // the application has already started + // do not reload everything again + if (QtNative.isStarted()) { + m_loader = null; + Log.w(QtNative.QtTAG, + "A QtService tried to start in the same process as an initiated " + + "QtActivity. That is not supported. This results in the service " + + "functioning as an Android Service detached from Qt."); + } else { + m_loader.onCreate(); + } } @Override public void onCreate() |