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

Commit 878346cb authored by Raph Levien's avatar Raph Levien Committed by android-build-merger
Browse files

Enforce consistent sizes for arrays in SpannableStringInternal 

am: 83549088

Change-Id: I6fd3b65dd388abcce6f8b7062f396a6fcf8fdf7a
parents 74206f05 83549088

core/java/android/text/SpannableStringInternal.java

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import java.lang.reflect.Array; 
            mText = source.toString().substring(start, end);



        mSpans = EmptyArray.OBJECT;

        // Invariant: mSpanData.length = mSpans.length * COLUMNS

        mSpanData = EmptyArray.INT;



        if (source instanceof Spanned) {
@@ -99,7 +100,7 @@ import java.lang.reflect.Array; 
            Object[] srcSpans = src.mSpans;

            mSpanCount = count;

            mSpans = ArrayUtils.newUnpaddedObjectArray(mSpanCount);

            mSpanData = new int[mSpanCount * COLUMNS];

            mSpanData = new int[mSpans.length * COLUMNS];

            for (int i = 0, j = 0; i < limit; i++) {

                int spanStart = srcData[i * COLUMNS + START];

                int spanEnd = srcData[i * COLUMNS + END];