From fe51137f859948472571ce4c879955eb74c77716 Mon Sep 17 00:00:00 2001
From: Piotr Mikolajczyk <piotr.mikolajczyk@qt.io>
Date: Thu, 17 Dec 2020 09:40:48 +0100
Subject: Android: Fix for accessibility potential crash

When accessibility was not active it was possible to force its
update, causing a null pointer exception in java.

Pick-to: 6.0 5.15
Change-Id: I60f65612d6e9f712ba3c591ffcc6803f06f09efb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 .../org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/android')

diff --git a/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
index 57b43bc279..4e54f41143 100644
--- a/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
@@ -203,6 +203,8 @@ public class QtAccessibilityDelegate extends View.AccessibilityDelegate
 
     public void notifyObjectFocus(int viewId)
     {
+        if (m_view == null)
+            return;
         m_view.invalidate();
         sendEventForVirtualViewId(viewId,
                 AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED);
-- 
cgit v1.2.3