diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2012-06-01 11:16:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-01 11:16:21 -0700 |
| commit | dd5543a6ffb2f543d9a45b541808561370c34f86 (patch) | |
| tree | 0ad1090055f2a10d7864f0a02ca2ace76c7bff6a | |
| parent | 4ba77f165c0814dbb4a4bce7fdffef160912ae41 (diff) | |
| parent | ac483ac41f19b9956069eebdc0275ccf90d4e01d (diff) | |
| download | frameworks_base-dd5543a6ffb2f543d9a45b541808561370c34f86.zip frameworks_base-dd5543a6ffb2f543d9a45b541808561370c34f86.tar.gz frameworks_base-dd5543a6ffb2f543d9a45b541808561370c34f86.tar.bz2 | |
am ac483ac4: Merge "AccessibilityInteractionController crash with IndexOutOfBoundException." into jb-dev
* commit 'ac483ac41f19b9956069eebdc0275ccf90d4e01d':
AccessibilityInteractionController crash with IndexOutOfBoundException.
| -rw-r--r-- | core/java/android/view/AccessibilityInteractionController.java | 4 |
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 |