Android: Fix deadlock caused by a race between permissions query and IM

Android permissions query blocks Qt main thread. If the input method
was activated before the permissions query started, android would try
to invoke input method before returning back to permissions query.
This will cause a deadlock.

Fix the issue by moving the deadlock counter to Qt core and
incrementing the value before the permissions query. This will prevent
the input method queries to enter Qt main thread.

Fixes: QTBUG-99484
Pick-to: 6.2 6.3 6.3.0
Change-Id: I54ea59578880cde4095c26fa2a6a264c4dc1b7ff
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

1 files changed, 4 insertions, 10 deletions

diff --git a/src/plugins/platforms/android/androiddeadlockprotector.h b/src/plugins/platforms/android/androiddeadlockprotector.h
index 7fa5bcfcb9..9092eda78b 100644
--- a/src/plugins/platforms/android/androiddeadlockprotector.h
+++ b/src/plugins/platforms/android/androiddeadlockprotector.h
@@ -40,31 +40,25 @@
 #ifndef ANDROID_DEADLOCKPROTECTOR_H
 #define ANDROID_DEADLOCKPROTECTOR_H
 
-#include <QAtomicInt>
+#include <QtCore/private/qjnihelpers_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class AndroidDeadlockProtector
 {
 public:
-    AndroidDeadlockProtector()
-        : m_acquired(0)
-    {
-    }
-
     ~AndroidDeadlockProtector() {
         if (m_acquired)
-            s_blocked.storeRelease(0);
+            QtAndroidPrivate::releaseAndroidDeadlockProtector();
     }
 
     bool acquire() {
-        m_acquired = s_blocked.testAndSetAcquire(0, 1);
+        m_acquired = QtAndroidPrivate::acquireAndroidDeadlockProtector();
         return m_acquired;
     }
 
 private:
-    static QAtomicInt s_blocked;
-    int m_acquired;
+    bool m_acquired = false;
 };
 
 QT_END_NAMESPACE