summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2011-10-26 14:47:49 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-26 14:47:49 -0700
commitb0267e2870741928f6c7da93a4e9b2d5c14da8e3 (patch)
treee7c13a3c32bec70a0327126eef77f9580e36411b
parent733442e33ab20c04fe115d295e2b74967e8e448d (diff)
parentc0291bb2eb96e96e0fe06047be929f89aa985ae6 (diff)
downloadframeworks_base-b0267e2870741928f6c7da93a4e9b2d5c14da8e3.zip
frameworks_base-b0267e2870741928f6c7da93a4e9b2d5c14da8e3.tar.gz
frameworks_base-b0267e2870741928f6c7da93a4e9b2d5c14da8e3.tar.bz2
Merge "AccessibilityNodeInfo makes incorrect check before calling into the system." into ics-mr1
-rw-r--r--core/java/android/view/accessibility/AccessibilityNodeInfo.java2
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 7671312..fa34ee7 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java
@@ -293,7 +293,7 @@ public class AccessibilityNodeInfo implements Parcelable {
*/
public AccessibilityNodeInfo getParent() {
enforceSealed();
- if (!canPerformRequestOverConnection(mAccessibilityViewId)) {
+ if (!canPerformRequestOverConnection(mParentAccessibilityViewId)) {
return null;
}
AccessibilityInteractionClient client = AccessibilityInteractionClient.getInstance();