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

Commit 735583ff authored by Riley Jones's avatar Riley Jones Committed by Automerger Merge Worker
Browse files

Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev am: 92e59dde 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18441236



Change-Id: I0c63dc11c723b4986af8993e99f85a55f1362711
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b179a4a1 92e59dde

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

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

            int spanToReplaceStart = spannable.getSpanStart(span);

            int spanToReplaceEnd = spannable.getSpanEnd(span);

            int spanToReplaceEnd = spannable.getSpanEnd(span);

            int spanToReplaceFlags = spannable.getSpanFlags(span);

            int spanToReplaceFlags = spannable.getSpanFlags(span);

            if (spanToReplaceStart < 0) {

                continue;

            }

            spannable.removeSpan(span);

            spannable.removeSpan(span);

            ClickableSpan replacementSpan = (span instanceof URLSpan)

            ClickableSpan replacementSpan = (span instanceof URLSpan)

                    ? new AccessibilityURLSpan((URLSpan) span)

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

            int spanToReplaceStart = spannable.getSpanStart(span);

            int spanToReplaceEnd = spannable.getSpanEnd(span);

            int spanToReplaceEnd = spannable.getSpanEnd(span);

            int spanToReplaceFlags = spannable.getSpanFlags(span);

            int spanToReplaceFlags = spannable.getSpanFlags(span);

            if (spanToReplaceStart < 0) {

                continue;

            }

            spannable.removeSpan(span);

            spannable.removeSpan(span);

            ReplacementSpan replacementSpan = new AccessibilityReplacementSpan(replacementText);

            ReplacementSpan replacementSpan = new AccessibilityReplacementSpan(replacementText);

            spannable.setSpan(replacementSpan, spanToReplaceStart, spanToReplaceEnd,

            spannable.setSpan(replacementSpan, spanToReplaceStart, spanToReplaceEnd,