commit a8181a9a0b420429a188218689a299fdf1335bb8
author Svetoslav <svetoslavganov@google.com> Fri Sep 26 01:51:53 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 26 01:51:54 2014 +0000
tree c1fc9b27d3abb93c22e6a0277ad534d73894b1a1
parent bec9f45b63111d5cd7fde1bb41542d309d6b80ee
parent c569d3594574598d54f69b36239d88f7e0d15b7d

Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev

core/java/android/view/AccessibilityInteractionController.java

diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java
index a283b91..baa133d 100644
--- a/core/java/android/view/AccessibilityInteractionController.java
+++ b/core/java/android/view/AccessibilityInteractionController.java
@@ -889,7 +889,13 @@
                     }
                 }
             } else {
-                AccessibilityNodeInfo root = provider.createAccessibilityNodeInfo(virtualViewId);
+                final AccessibilityNodeInfo root;
+                if (virtualViewId != AccessibilityNodeInfo.UNDEFINED_ITEM_ID) {
+                    root = provider.createAccessibilityNodeInfo(virtualViewId);
+                } else {
+                    root = provider.createAccessibilityNodeInfo(
+                            AccessibilityNodeProvider.HOST_VIEW_ID);
+                }
                 if (root != null) {
                     outInfos.add(root);
                     if ((fetchFlags & AccessibilityNodeInfo.FLAG_PREFETCH_PREDECESSORS) != 0) {