am c9a230f4: am bcc4f1bc: am b14c7e04: am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev

* commit 'c9a230f4d23e9e8b98b354f7758443701bee9bbc':
  Using wrong virtual view id When prefetching accessibility nodes.
This commit is contained in:
Svetoslav
2014-09-26 05:04:25 +00:00
committed by Android Git Automerger

View File

@@ -889,7 +889,13 @@ final class AccessibilityInteractionController {
}
}
} 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) {