From 14851471eefb8708a52981532ebaeed87509381f Mon Sep 17 00:00:00 2001
From: Petri Virkkunen <petri.virkkunen@qt.io>
Date: Thu, 22 Feb 2024 11:11:32 +0200
Subject: [PATCH] Do not register focus listener for null view in
 QtEmbeddedDelegate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A null view can not be focused.

Pick-to: 6.7
Change-Id: I0564dd554a304e2e60e3ae83c4782ac348edcd9b
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
---
 .../jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
index 66a3f6c949..975b26b915 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
@@ -135,7 +135,8 @@ class QtEmbeddedDelegate extends QtActivityDelegateBase implements QtNative.AppS
 
     void setView(QtView view) {
         m_view = view;
-        registerGlobalFocusChangeListener(m_view);
+        if (m_view != null)
+            registerGlobalFocusChangeListener(m_view);
     }
 
     public void setRootWindowRef(long ref) {