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

am 86bbf705: Merge "Settings crash after enabling TalkBack accessibility." into jb-dev

Browse Source 
* commit '86bbf70587602c1fd86fce1a2a4be78da45aaedc':
  Settings crash after enabling TalkBack accessibility.
This commit is contained in:
Svetoslav Ganov
2012-06-10 09:53:17 -07:00
committed by Android Git Automerger
parent a8e46828bf 86bbf70587
commit 3dbb70ec9c
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 =
(root != null) ? root.getAccessibilityViewId() : UNDEFINED;
mSourceNodeId = makeNodeId(rootAccessibilityViewId, virtualDescendantId);
mActualAndReportedWindowLeftDelta = root.getActualAndReportedWindowLeftDelta();
mActualAndReportedWindowTopDelta = root.getActualAndReportedWindowTopDelta();
if (root != null) {
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) {
mTouchExplorer.onAccessibilityEvent(event);
if (mTouchExplorer != null) {
mTouchExplorer.onAccessibilityEvent(event);
}
}
}