qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Piotr Mikolajczyk 2020-12-17 09:40:48 +01:00
parent 7a4e686240
commit fe51137f85
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java
View File

@ -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);

2
src/plugins/platforms/android/qandroidplatformaccessibility.cpp
View File

@ -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