commit ac483ac41f19b9956069eebdc0275ccf90d4e01d
author Svetoslav Ganov <svetoslavganov@google.com> Fri Jun 01 11:14:12 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 01 11:14:12 2012 -0700
tree 0dda97f971131fd9d09ec906fb37522e8d87f73e
parent ef3a8021e412b33db817789a9c1869022b5c901b
parent 30ac645210ecf96ae28fc5cb3b663aeb83dbdec1

Merge "AccessibilityInteractionController crash with IndexOutOfBoundException." into jb-dev

core/java/android/view/AccessibilityInteractionController.java

diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java
index 6dc31dd..bd86a8d 100644
--- a/core/java/android/view/AccessibilityInteractionController.java
+++ b/core/java/android/view/AccessibilityInteractionController.java
@@ -62,6 +62,8 @@
 
     private final int mMyProcessId;
 
+    private final ArrayList<View> mTempArrayList = new ArrayList<View>();
+
     public AccessibilityInteractionController(ViewRootImpl viewRootImpl) {
         Looper looper =  viewRootImpl.mHandler.getLooper();
         mMyLooperThreadId = looper.getThread().getId();
@@ -313,7 +315,7 @@
                     infos = provider.findAccessibilityNodeInfosByText(text,
                             virtualDescendantId);
                 } else if (virtualDescendantId == AccessibilityNodeInfo.UNDEFINED) {
-                    ArrayList<View> foundViews = mViewRootImpl.mAttachInfo.mTempArrayList;
+                    ArrayList<View> foundViews = mTempArrayList;
                     foundViews.clear();
                     root.findViewsWithText(foundViews, text, View.FIND_VIEWS_WITH_TEXT
                             | View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION