diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-26 02:00:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 02:00:18 +0000 |
| commit | e86737947a97977c59cba57b7e829b06ec61bdc9 (patch) | |
| tree | ed04b8cb6f567794e1013e075f99b2fd6682ce65 /core/java/android/view | |
| parent | 0d03d08819997daa2d5bb39d634c83eaef4713af (diff) | |
| parent | a8181a9a0b420429a188218689a299fdf1335bb8 (diff) | |
| download | frameworks_base-e86737947a97977c59cba57b7e829b06ec61bdc9.zip frameworks_base-e86737947a97977c59cba57b7e829b06ec61bdc9.tar.gz frameworks_base-e86737947a97977c59cba57b7e829b06ec61bdc9.tar.bz2 | |
am 9ec435dc: Merge "Using wrong virtual view id When prefetching accessibility nodes." into lmp-dev
* commit '9ec435dca7296db68b19e03300ff814e34f84c16':
Using wrong virtual view id When prefetching accessibility nodes.
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/AccessibilityInteractionController.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 @@ 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) { |