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

Author: sganov

core/java/android/view/accessibility/AccessibilityNodeInfo.java

@@ -432,8 +432,10 @@ public void setSource(View root, int virtualDescendantId) {
         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();
+        }
     }
 
     /**

services/java/com/android/server/accessibility/AccessibilityInputFilter.java

@@ -123,6 +123,8 @@ public void onInputEvent(InputEvent event, int policyFlags) {
     }
 
     public void onAccessibilityEvent(AccessibilityEvent event) {
-        mTouchExplorer.onAccessibilityEvent(event);
+        if (mTouchExplorer != null) {
+            mTouchExplorer.onAccessibilityEvent(event);
+        }
     }
 }