From e6211e49b94e4da857fcfc1af90fa33d123638be Mon Sep 17 00:00:00 2001
From: Petri Virkkunen <petri.virkkunen@qt.io>
Date: Wed, 24 Jul 2024 12:56:24 +0300
Subject: [PATCH] Android: Don't call QtWindow.windowFocusChanged with invalid
 window ID
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Invalid window ID just ends in an assert.

Pick-to: 6.7
Change-Id: I30ef90278ad2b862ada124beb0e5a7925192827b
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
(cherry picked from commit a624a7d00a925efd862bc3b84309a86f34291834)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../src/org/qtproject/qt/android/QtActivityDelegateBase.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
index d8a2f50cb93..32b00856ea9 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegateBase.java
@@ -120,9 +120,8 @@ abstract class QtActivityDelegateBase
             int id = -1;
             if (oldFocus instanceof QtEditText) {
                 final QtWindow oldWindow = (QtWindow) oldFocus.getParent();
-                id = oldWindow.getId();
+                QtWindow.windowFocusChanged(false, oldWindow.getId());
             }
-            QtWindow.windowFocusChanged(false, id);
         }
     }