commit fe89325864806599cb1ad42131685e894c2f1c1f
author Rhed Jao <rhedjao@google.com> Thu Mar 07 19:24:34 2019 +0800
committer Rhed Jao <rhedjao@google.com> Thu Mar 07 19:24:34 2019 +0800
tree d6c17cfd215caedf0868b6f80fdd1ef1c3f10856
parent 0a68a093b23132def6bd33f2a33b0c507c1f6fe9

Fix ArrayIndexOutOfBoundsException in A11yCache

Bug: 127761516
Test: atest MediaStoreUiTest#testGetDocumentUri
Change-Id: I55824d4932bc7c430ac7f357237b444bedc71b58

core/java/android/view/accessibility/AccessibilityCache.java

diff --git a/core/java/android/view/accessibility/AccessibilityCache.java b/core/java/android/view/accessibility/AccessibilityCache.java
index 5d59e42..df8690d 100644
--- a/core/java/android/view/accessibility/AccessibilityCache.java
+++ b/core/java/android/view/accessibility/AccessibilityCache.java
@@ -360,7 +360,7 @@
             }
             clearWindowCache();
             final int nodesForWindowCount = mNodeCache.size();
-            for (int i = 0; i < nodesForWindowCount; i++) {
+            for (int i = nodesForWindowCount - 1; i >= 0; i--) {
                 final int windowId = mNodeCache.keyAt(i);
                 clearNodesForWindowLocked(windowId);
             }