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

Commit 445326d9 authored by Haoyu Zhang's avatar Haoyu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix equals not working correctly in SpannableString and SpannableStringBuilder"

parents 09a2a1c3 6b4380ea

core/java/android/text/SpannableStringBuilder.java

+5 −4
Original line number Diff line number Diff line
@@ -1610,13 +1610,14 @@ public class SpannableStringBuilder implements CharSequence, GetChars, Spannable 
    public boolean equals(Object o) {

        if (o instanceof Spanned &&

                toString().equals(o.toString())) {

            Spanned other = (Spanned) o;

            final Spanned other = (Spanned) o;

            // Check span data

            Object[] otherSpans = other.getSpans(0, other.length(), Object.class);

            final Object[] otherSpans = other.getSpans(0, other.length(), Object.class);

            final Object[] thisSpans = getSpans(0, length(), Object.class);

            if (mSpanCount == otherSpans.length) {

                for (int i = 0; i < mSpanCount; ++i) {

                    Object thisSpan = mSpans[i];

                    Object otherSpan = otherSpans[i];

                    final Object thisSpan = thisSpans[i];

                    final Object otherSpan = otherSpans[i];

                    if (thisSpan == this) {

                        if (other != otherSpan ||

                                getSpanStart(thisSpan) != other.getSpanStart(otherSpan) ||

core/java/android/text/SpannableStringInternal.java

+7 −5
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ 


package android.text;



import android.annotation.UnsupportedAppUsage;



import com.android.internal.util.ArrayUtils;

import com.android.internal.util.GrowingArrayUtils;



import libcore.util.EmptyArray;



import android.annotation.UnsupportedAppUsage;

import java.lang.reflect.Array;



/* package */ abstract class SpannableStringInternal
@@ -502,13 +503,14 @@ import java.lang.reflect.Array; 
    public boolean equals(Object o) {

        if (o instanceof Spanned &&

                toString().equals(o.toString())) {

            Spanned other = (Spanned) o;

            final Spanned other = (Spanned) o;

            // Check span data

            Object[] otherSpans = other.getSpans(0, other.length(), Object.class);

            final Object[] otherSpans = other.getSpans(0, other.length(), Object.class);

            final Object[] thisSpans = getSpans(0, length(), Object.class);

            if (mSpanCount == otherSpans.length) {

                for (int i = 0; i < mSpanCount; ++i) {

                    Object thisSpan = mSpans[i];

                    Object otherSpan = otherSpans[i];

                    final Object thisSpan = thisSpans[i];

                    final Object otherSpan = otherSpans[i];

                    if (thisSpan == this) {

                        if (other != otherSpan ||

                                getSpanStart(thisSpan) != other.getSpanStart(otherSpan) ||