Merge "Settings crash after enabling TalkBack accessibility." into jb-dev

2 files changed, 7 insertions, 3 deletions

diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
index 0daf78ba069c..3834fd67a08e 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();
+        }
     }
 
     /**
diff --git a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
index baa2f54a444e..8fa6722792ab 100644
--- a/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
+++ b/services/java/com/android/server/accessibility/AccessibilityInputFilter.java
@@ -123,6 +123,8 @@ public class AccessibilityInputFilter extends InputFilter {
     }
 
     public void onAccessibilityEvent(AccessibilityEvent event) {
-        mTouchExplorer.onAccessibilityEvent(event);
+        if (mTouchExplorer != null) {
+            mTouchExplorer.onAccessibilityEvent(event);
+        }
     }
 }