diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-08 16:09:29 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-08 16:09:36 -0700 |
| commit | ee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1 (patch) | |
| tree | bdae1442798fdc5891a18ef85da0261c974334a7 /core/java/android/view/accessibility | |
| parent | 4206ee2b680fb2c273c03efc9083e327c7051121 (diff) | |
| download | frameworks_base-ee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1.zip frameworks_base-ee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1.tar.gz frameworks_base-ee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1.tar.bz2 | |
Settings crash after enabling TalkBack accessibility.
1. AccessibilityInput filter was not checking whether the touch
explorer instance is not null before passing it an accessibility
event. If the accessibility event is dispatched before the input
filter is installed but after it is created we runt into this
case.
2. Added a missing null check in accessibility node info.
bug:6635089
Change-Id: Ia389dc1f427427eb73794f6331ccb870e0b44c55
Diffstat (limited to 'core/java/android/view/accessibility')
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfo.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 0daf78b..3834fd6 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -432,8 +432,10 @@ public class AccessibilityNodeInfo implements Parcelable { final int rootAccessibilityViewId = (root != null) ? root.getAccessibilityViewId() : UNDEFINED; mSourceNodeId = makeNodeId(rootAccessibilityViewId, virtualDescendantId); - mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta(); - mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta(); + if (root != null) { + mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta(); + mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta(); + } } /** |