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

Commit 6feab9fb authored by Siyamed Sinir's avatar Siyamed Sinir Committed by Android (Google) Code Review
Browse files

Merge "SpannableStringBuilder.getSpans returns array with null values."

parents bfb94e21 3a789f65

core/java/android/text/SpannableStringBuilder.java

+6 −5
Original line number Diff line number Diff line
@@ -965,10 +965,10 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable 
                        (spanStart != queryEnd && spanEnd != queryStart)) &&

                        (Object.class == kind || kind.isInstance(mSpans[i]))) {

                int spanPriority = mSpanFlags[i] & SPAN_PRIORITY;

                int target = count;

                if (sort) {

                    ret[count] = (T) mSpans[i];

                    priority[count] = spanPriority;

                    insertionOrder[count] = mSpanOrder[i];

                    priority[target] = spanPriority;

                    insertionOrder[target] = mSpanOrder[i];

                } else if (spanPriority != 0) {

                    //insertion sort for elements with priority

                    int j = 0;
@@ -977,8 +977,9 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable 
                        if (spanPriority > p) break;

                    }

                    System.arraycopy(ret, j, ret, j + 1, count - j);

                    ret[j] = (T) mSpans[i];

                    target = j;

                }

                ret[target] = (T) mSpans[i];

                count++;

            }

            if (count < ret.length && (i & 1) != 0) {