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

Commit c1a8a2a9 authored by Riley Jones's avatar Riley Jones Committed by Android (Google) Code Review
Browse files

Merge "Changed textView's addExtraDataToAccessibilityNodeInfo() to avoid Out... 

Merge "Changed textView's addExtraDataToAccessibilityNodeInfo() to avoid Out of Bounds errors when Location Length exceeds Text Length. Specified the accessibilityService CTS tests to run for core presubmit."
parents ce8dd7a1 9b471535

core/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
        {

          "include-filter": "com.android.internal.inputmethod"

        },

        {

          "include-filter": "android.accessibilityService.cts"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

core/java/android/widget/TextView.java

+1 −1
Original line number Diff line number Diff line
@@ -12496,7 +12496,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            RectF[] boundingRects = new RectF[positionInfoLength];

            final CursorAnchorInfo.Builder builder = new CursorAnchorInfo.Builder();

            populateCharacterBounds(builder, positionInfoStartIndex,

                    positionInfoStartIndex + positionInfoLength,

                    Math.min(positionInfoStartIndex + positionInfoLength, length()),

                    viewportToContentHorizontalOffset(), viewportToContentVerticalOffset());

            CursorAnchorInfo cursorAnchorInfo = builder.setMatrix(null).build();

            for (int i = 0; i < positionInfoLength; i++) {