From 95c21244cc0d038af27d4eb4171567a3c5df5e35 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 6 Jan 2025 16:25:21 +0200 Subject: [PATCH] Android: move getRotation() directly under handleOrientationChange() This call is done only from handleOrientationChange(). Task-number: QTBUG-132716 Change-Id: Ib483a8d37c61514bc1a3cf1ca107518ffaaeb572 Reviewed-by: Petri Virkkunen --- .../qtproject/qt/android/QtDisplayManager.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java index 17902b785fa..8c139bc19ed 100644 --- a/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java +++ b/src/android/jar/src/org/qtproject/qt/android/QtDisplayManager.java @@ -84,17 +84,13 @@ class QtDisplayManager { static void handleOrientationChange(Activity activity) { - int currentRotation = getDisplayRotation(activity); - if (m_previousRotation == currentRotation) - return; - int nativeOrientation = getNativeOrientation(activity, currentRotation); - QtDisplayManager.handleOrientationChanged(currentRotation, nativeOrientation); - m_previousRotation = currentRotation; - } - - static int getDisplayRotation(Activity activity) { Display display = QtDisplayManager.getDisplay(activity); - return display != null ? display.getRotation() : 0; + int rotation = display != null ? display.getRotation() : 0; + if (m_previousRotation == rotation) + return; + int nativeOrientation = getNativeOrientation(activity, rotation); + QtDisplayManager.handleOrientationChanged(rotation, nativeOrientation); + m_previousRotation = rotation; } private static int getNativeOrientation(Activity activity, int rotation)