Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I08ad40cc9341b76f67551da0791b9c94109924ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riley Jones
2022-05-18 22:48:54 +00:00
committed by Automerger Merge Worker
parent c022b030e4 92e59dde2f
commit fcd285b64a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/accessibility/AccessibilityNodeInfo.java
View File

@@ -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,