From 258d90222d16107768b985f96a014898cd6d2393 Mon Sep 17 00:00:00 2001
From: Bartlomiej Moskal <bartlomiej.moskal@qt.io>
Date: Wed, 2 Oct 2024 11:23:12 +0200
Subject: [PATCH] Android: Catch nullPointerExcetion for parentLayout

Add exception handling for non-existent parent for m_editText in
EditPopupMenu

Pick-to: 6.7
Change-Id: Ie01e1346185b494c1ac646ccfa9ed4a96c4ed85e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e39ea199167270971f45ab6c4b9c2c6c66b4b2ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../jar/src/org/qtproject/qt/android/EditPopupMenu.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
index ca79bfd3804..cd107ab4882 100644
--- a/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
+++ b/src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java
@@ -82,6 +82,9 @@ class EditPopupMenu implements ViewTreeObserver.OnPreDrawListener, View.OnLayout
             } catch (ClassCastException e) {
                 Log.w(QtNative.QtTAG, "QtEditText " + m_editText + " parent is not a QtLayout, " +
                                       "requestLayout() skipped");
+            } catch (NullPointerException e) {
+                Log.w(QtNative.QtTAG, "QtEditText " + m_editText + " does not have a parent, " +
+                                      "requestLayout() skipped");
             }
         }