summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src
diff options
context:
space:
mode:
authorPiotr Mikolajczyk <piotr.mikolajczyk@qt.io>2020-12-17 09:40:48 +0100
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2021-01-26 10:57:34 +0200
commitc305044a0a34ed94825f6071890bf22a8c28d80d (patch)
treef5772c0c020472d19cf60ece2460f1c678aa14b1 /src/android/jar/src
parent763632378b1c7c51217d5976f2f26c675d4b03ca (diff)
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. Change-Id: I60f65612d6e9f712ba3c591ffcc6803f06f09efb Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit fe51137f859948472571ce4c879955eb74c77716) Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'src/android/jar/src')
-rw-r--r--src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
index a607eccc85..360902c1db 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/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);