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

Commit 484f7b4d authored by Riley Jones's avatar Riley Jones
Browse files

Fix for out-of-bound error regarding NoCopySpan objects 

Bug: 169417148
Change-Id: I2e4a0a3745bb3a53d8f22d4090cdf4d93e19116b
Merged-In: I2e4a0a3745bb3a53d8f22d4090cdf4d93e19116b
parent 591aa05f

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -3046,6 +3046,9 @@ public class AccessibilityNodeInfo implements Parcelable { 
            int spanToReplaceStart = spannable.getSpanStart(span);

            int spanToReplaceEnd = spannable.getSpanEnd(span);

            int spanToReplaceFlags = spannable.getSpanFlags(span);

            if (spanToReplaceStart < 0) {

                continue;

            }

            spannable.removeSpan(span);

            ClickableSpan replacementSpan = (span instanceof URLSpan)

                    ? new AccessibilityURLSpan((URLSpan) span)
@@ -3083,6 +3086,9 @@ public class AccessibilityNodeInfo implements Parcelable { 
            int spanToReplaceStart = spannable.getSpanStart(span);

            int spanToReplaceEnd = spannable.getSpanEnd(span);

            int spanToReplaceFlags = spannable.getSpanFlags(span);

            if (spanToReplaceStart < 0) {

                continue;

            }

            spannable.removeSpan(span);

            ReplacementSpan replacementSpan = new AccessibilityReplacementSpan(replacementText);

            spannable.setSpan(replacementSpan, spanToReplaceStart, spanToReplaceEnd,