diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-10-26 15:29:26 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-10-26 15:29:26 -0700 |
| commit | af0d984a5850666a374d6f7fc690664d33d57568 (patch) | |
| tree | 9ecdc3e848da0a1f4ee798b087ff4fcb7572d434 /core/java/android/view/accessibility | |
| parent | 35e6a685d6c9eccd3c2936d42b7a19263daa646b (diff) | |
| parent | b0267e2870741928f6c7da93a4e9b2d5c14da8e3 (diff) | |
| download | frameworks_base-af0d984a5850666a374d6f7fc690664d33d57568.zip frameworks_base-af0d984a5850666a374d6f7fc690664d33d57568.tar.gz frameworks_base-af0d984a5850666a374d6f7fc690664d33d57568.tar.bz2 | |
resolved conflicts for merge of b0267e28 to master
Change-Id: Ic65ab83958b2e6bb941fe015b557fd2fd8f80683
Diffstat (limited to 'core/java/android/view/accessibility')
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfo.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index e792666..4bfd982 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -393,7 +393,7 @@ public class AccessibilityNodeInfo implements Parcelable { */ public AccessibilityNodeInfo getParent() { enforceSealed(); - if (!canPerformRequestOverConnection(mSourceNodeId)) { + if (!canPerformRequestOverConnection(mParentNodeId)) { return null; } AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance(); |