Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adaafb29 authored by Phil Weaver's avatar Phil Weaver
Browse files

Fix a11y crash when window layer isn't unique. 

TalkBack is seeing crashes that I can only explain by our assumption
that window layer is unique in all cases. TalkBack reports that it
happens during animation, so I assume that the layer may repeat
transiently.

Reducing our dependence on this assumption by traversing the list of
windows sorted by layer without assuming that the list has the same
length as the list of unsorted windows.

Also documenting the undefined behavior of SparseArray when indexing
beyond its bounds. The undefined behavior itself is intentional for
performance reasons.

Bug: 28679528
Bug: 28815817
Change-Id: I0c9f90b0b458b4cde465f603ba204fe6691e5c2c
parent 29af3cab

core/java/android/util/SparseArray.java

+14 −0
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ public class SparseArray<E> implements Cloneable { 


    /**

     * Removes the mapping at the specified index.

     *

     * <p>For indices outside of the range <code>0...size()-1</code>,

     * the behavior is undefined.</p>

     */

    public void removeAt(int index) {

        if (mValues[index] != DELETED) {
@@ -173,6 +176,9 @@ public class SparseArray<E> implements Cloneable { 
     *

     * @param index Index to begin at

     * @param size Number of mappings to remove

     *

     * <p>For indices outside of the range <code>0...size()-1</code>,

     * the behavior is undefined.</p>

     */

    public void removeAtRange(int index, int size) {

        final int end = Math.min(mSize, index + size);
@@ -262,6 +268,9 @@ public class SparseArray<E> implements Cloneable { 
     * be in ascending order, e.g., <code>keyAt(0)</code> will return the

     * smallest key and <code>keyAt(size()-1)</code> will return the largest

     * key.</p>

     *

     * <p>For indices outside of the range <code>0...size()-1</code>,

     * the behavior is undefined.</p>

     */

    public int keyAt(int index) {

        if (mGarbage) {
@@ -281,6 +290,9 @@ public class SparseArray<E> implements Cloneable { 
     * <code>valueAt(0)</code> will return the value associated with the

     * smallest key and <code>valueAt(size()-1)</code> will return the value

     * associated with the largest key.</p>

     *

     * <p>For indices outside of the range <code>0...size()-1</code>,

     * the behavior is undefined.</p>

     */

    @SuppressWarnings("unchecked")

    public E valueAt(int index) {
@@ -295,6 +307,8 @@ public class SparseArray<E> implements Cloneable { 
     * Given an index in the range <code>0...size()-1</code>, sets a new

     * value for the <code>index</code>th key-value mapping that this

     * SparseArray stores.

     *

     * <p>For indices outside of the range <code>0...size()-1</code>, the behavior is undefined.</p>

     */

    public void setValueAt(int index, E value) {

        if (mGarbage) {

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

+5 −2
Original line number Diff line number Diff line
@@ -221,8 +221,11 @@ final class AccessibilityCache { 
                    sortedWindows.put(window.getLayer(), window);

                }



                List<AccessibilityWindowInfo> windows = new ArrayList<>(windowCount);

                for (int i = windowCount - 1; i >= 0; i--) {

                // It's possible in transient conditions for two windows to share the same

                // layer, which results in sortedWindows being smaller than mWindowCache

                final int sortedWindowCount = sortedWindows.size();

                List<AccessibilityWindowInfo> windows = new ArrayList<>(sortedWindowCount);

                for (int i = sortedWindowCount - 1; i >= 0; i--) {

                    AccessibilityWindowInfo window = sortedWindows.valueAt(i);

                    windows.add(AccessibilityWindowInfo.obtain(window));

                    sortedWindows.removeAt(i);