From ca17c91c4a87accaea88f52f5fb326bc41e4d1dd Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 10 Sep 2025 17:45:29 +0300 Subject: [PATCH] Android: don't keep system visibility cache on both C++ and Java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since Android Java side is managing the system ui visibility calls, keep any cached states there to avoid any inconsistency between the two sides, so Qt always sends the call and Java decides whether it goes through with it or not. Pick-to: 6.10 6.10.0 Change-Id: I68dfb64fe38ecd7d71a6aae5bfa2e32b8f481b04 Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/android/qandroidplatformwindow.cpp | 8 ++------ src/plugins/platforms/android/qandroidplatformwindow.h | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/plugins/platforms/android/qandroidplatformwindow.cpp b/src/plugins/platforms/android/qandroidplatformwindow.cpp index ccd40f5f5d4..958290fd53d 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformwindow.cpp @@ -263,12 +263,8 @@ void QAndroidPlatformWindow::updateSystemUiVisibility() if (!isNonRegularWindow) { const bool isFullScreen = (m_windowState & Qt::WindowFullScreen); const bool expandedToCutout = (flags & Qt::ExpandedClientAreaHint); - if (m_isFullscreen != isFullScreen || m_expandedToCutout != expandedToCutout) { - m_isFullscreen = isFullScreen; - m_expandedToCutout = expandedToCutout; - QtAndroid::backendRegister()->callInterface( - "setSystemUiVisibility", isFullScreen, expandedToCutout); - } + QtAndroid::backendRegister()->callInterface( + "setSystemUiVisibility", isFullScreen, expandedToCutout); } } diff --git a/src/plugins/platforms/android/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h index b3fc0960cad..07f4e12b35c 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.h +++ b/src/plugins/platforms/android/qandroidplatformwindow.h @@ -112,9 +112,6 @@ private: Q_DECLARE_JNI_NATIVE_METHOD_IN_CURRENT_SCOPE(safeAreaMarginsChanged) [[nodiscard]] QMutexLocker destructionGuard(); - - bool m_isFullscreen; - bool m_expandedToCutout; }; QT_END_NAMESPACE