diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-10 09:50:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-10 09:50:24 -0700 |
| commit | 86bbf70587602c1fd86fce1a2a4be78da45aaedc (patch) | |
| tree | 601c81e3f2818f2b4fdfe4428c7b72a42e68010d /core | |
| parent | 2e6f9be5633cf37223425b9b93c0b1512db091af (diff) | |
| parent | ee33ad24cdc31ed0d7f99e110e041b0a63c9b0f1 (diff) | |
| download | frameworks_base-86bbf70587602c1fd86fce1a2a4be78da45aaedc.zip frameworks_base-86bbf70587602c1fd86fce1a2a4be78da45aaedc.tar.gz frameworks_base-86bbf70587602c1fd86fce1a2a4be78da45aaedc.tar.bz2 | |
Merge "Settings crash after enabling TalkBack accessibility." into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfo.java | 6 |
1 files changed, 4 insertions, 2 deletions
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(); + } } /** |