From ee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1 Mon Sep 17 00:00:00 2001 From: Svetoslav Ganov Date: Fri, 8 Jun 2012 16:09:29 -0700 Subject: 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 --- core/java/android/view/accessibility/AccessibilityNodeInfo.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/java') 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(); + } } /** -- cgit v1.1