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

Enforce consistent sizes for arrays in SpannableStringInternal

Browse Source 
am: 9cde7244b6

Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46
This commit is contained in:
Raph Levien
2016-08-30 17:36:33 +00:00
committed by android-build-merger
parent c1d52a634c 9cde7244b6
commit 84c45e7085
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);
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];