summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-06-01 11:14:12 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-01 11:14:12 -0700
commitac483ac41f19b9956069eebdc0275ccf90d4e01d (patch)
tree0dda97f971131fd9d09ec906fb37522e8d87f73e /core
parentef3a8021e412b33db817789a9c1869022b5c901b (diff)
parent30ac645210ecf96ae28fc5cb3b663aeb83dbdec1 (diff)
downloadframeworks_base-ac483ac41f19b9956069eebdc0275ccf90d4e01d.zip
frameworks_base-ac483ac41f19b9956069eebdc0275ccf90d4e01d.tar.gz
frameworks_base-ac483ac41f19b9956069eebdc0275ccf90d4e01d.tar.bz2
Merge "AccessibilityInteractionController crash with IndexOutOfBoundException." into jb-dev
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/AccessibilityInteractionController.java4
1 files changed, 3 insertions, 1 deletions
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 @@ final class AccessibilityInteractionController {
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 @@ final class AccessibilityInteractionController {
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