Merge "Fix for out-of-bound error regarding NoCopySpan objects" into tm-dev am: 92e59dde2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18441236 Change-Id: I3655665e13e0572ed90e45359db6ba72af266b3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user