From 9ed54aadc22abc4818f08537496ddae1d29419d4 Mon Sep 17 00:00:00 2001 From: Piotr Mikolajczyk Date: Thu, 17 Dec 2020 09:40:48 +0100 Subject: [PATCH] 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 (cherry picked from commit fe51137f859948472571ce4c879955eb74c77716) Reviewed-by: Qt Cherry-pick Bot --- .../qt/android/accessibility/QtAccessibilityDelegate.java | 2 ++ src/plugins/platforms/android/qandroidplatformaccessibility.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 57b43bc2793..4e54f411438 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); diff --git a/src/plugins/platforms/android/qandroidplatformaccessibility.cpp b/src/plugins/platforms/android/qandroidplatformaccessibility.cpp index 30114b17a22..cc05dad749d 100644 --- a/src/plugins/platforms/android/qandroidplatformaccessibility.cpp +++ b/src/plugins/platforms/android/qandroidplatformaccessibility.cpp @@ -52,7 +52,7 @@ QAndroidPlatformAccessibility::~QAndroidPlatformAccessibility() void QAndroidPlatformAccessibility::notifyAccessibilityUpdate(QAccessibleEvent *event) { - if (event == nullptr || !event->accessibleInterface()) + if (!isActive() || event == nullptr || !event->accessibleInterface()) return; // We do not need implementation of all events, as current statues are polled