summaryrefslogtreecommitdiffstats
path: root/src/android/jar/src/org
diff options
context:
space:
mode:
authorPiotr Mikolajczyk <piotr.mikolajczyk@qt.io>2020-12-17 09:40:48 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-12-18 08:54:09 +0000
commit9ed54aadc22abc4818f08537496ddae1d29419d4 (patch)
tree7f6f6b0e1d1bdc37e9fae1775aac5ab6f55695d4 /src/android/jar/src/org
parent6341e89e2874101754698c732c125c13e19a954f (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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/android/jar/src/org')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java2
1 files changed, 2 insertions, 0 deletions
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);