Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Svetoslav Ganov
2012-06-10 09:50:24 -07:00
committed by Android (Google) Code Review
parent 2e6f9be563 ee33ad24cd
commit 86bbf70587
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

@@ -432,8 +432,10 @@ public class AccessibilityNodeInfo implements Parcelable {
final int rootAccessibilityViewId = final int rootAccessibilityViewId =
(root != null) ? root.getAccessibilityViewId() : UNDEFINED; (root != null) ? root.getAccessibilityViewId() : UNDEFINED;
mSourceNodeId = makeNodeId(rootAccessibilityViewId, virtualDescendantId); mSourceNodeId = makeNodeId(rootAccessibilityViewId, virtualDescendantId);
mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta(); if (root != null) {
mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta(); mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta();
mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta();
}
} }
/** /**

4
services/java/com/android/server/accessibility/AccessibilityInputFilter.java
View File

@@ -123,6 +123,8 @@ public class AccessibilityInputFilter extends InputFilter {
} }
public void onAccessibilityEvent(AccessibilityEvent event) { public void onAccessibilityEvent(AccessibilityEvent event) {
mTouchExplorer.onAccessibilityEvent(event); if (mTouchExplorer != null) {
mTouchExplorer.onAccessibilityEvent(event);
}
} }
} }