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

Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-mr1-dev

Browse Source
This commit is contained in:
Raph Levien
2016-07-25 20:52:39 +00:00
committed by Android (Google) Code Review
parent d021ba34fb 83549088c6
commit 4e0fc3ccd2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/text/SpannableStringInternal.java
View File

@@ -33,6 +33,7 @@ import java.lang.reflect.Array;
mText = source.toString().substring(start, end); mText = source.toString().substring(start, end);
mSpans = EmptyArray.OBJECT; mSpans = EmptyArray.OBJECT;
// Invariant: mSpanData.length = mSpans.length * COLUMNS
mSpanData = EmptyArray.INT; mSpanData = EmptyArray.INT;
if (source instanceof Spanned) { if (source instanceof Spanned) {
@@ -99,7 +100,7 @@ import java.lang.reflect.Array;
Object[] srcSpans = src.mSpans; Object[] srcSpans = src.mSpans;
mSpanCount = count; mSpanCount = count;
mSpans = ArrayUtils.newUnpaddedObjectArray(mSpanCount); mSpans = ArrayUtils.newUnpaddedObjectArray(mSpanCount);
mSpanData = new int[mSpanCount * COLUMNS]; mSpanData = new int[mSpans.length * COLUMNS];
for (int i = 0, j = 0; i < limit; i++) { for (int i = 0, j = 0; i < limit; i++) {
int spanStart = srcData[i * COLUMNS + START]; int spanStart = srcData[i * COLUMNS + START];
int spanEnd = srcData[i * COLUMNS + END]; int spanEnd = srcData[i * COLUMNS + END];